projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved data and snapshot classes into pv::data namespace
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index a54708e3f61a8c9079dff7a3bda7e285b03a0cb2..e9ae0e76e4de201664c3d640ec59d4b9ce24038c 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-46,18
+46,14
@@
pkg_check_modules(PKGDEPS REQUIRED
libsigrok>=0.2.0
)
libsigrok>=0.2.0
)
+find_package(Qt4 REQUIRED)
+
# On Windows/MinGW we explicitly point cmake to the Boost directory.
if(WIN32)
set(BOOST_ROOT /usr/local)
endif()
# On Windows/MinGW we explicitly point cmake to the Boost directory.
if(WIN32)
set(BOOST_ROOT /usr/local)
endif()
-find_package(Qt4 REQUIRED)
-
-if(ENABLE_TESTS)
-find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
-else()
-find_package(Boost 1.46)
-endif()
+find_package(Boost 1.46 COMPONENTS system thread)
#===============================================================================
#= Config Header
#===============================================================================
#= Config Header
@@
-84,35
+80,42
@@
configure_file (
set(pulseview_SOURCES
main.cpp
set(pulseview_SOURCES
main.cpp
- pv/about.cpp
- pv/datasnapshot.cpp
- pv/logicdata.cpp
- pv/logicdatasnapshot.cpp
- pv/logicsignal.cpp
pv/mainwindow.cpp
pv/samplingbar.cpp
pv/mainwindow.cpp
pv/samplingbar.cpp
- pv/signaldata.cpp
pv/sigsession.cpp
pv/sigsession.cpp
- pv/signal.cpp
+ pv/data/analog.cpp
+ pv/data/analogsnapshot.cpp
+ pv/data/logic.cpp
+ pv/data/logicsnapshot.cpp
+ pv/data/signaldata.cpp
+ pv/data/snapshot.cpp
+ pv/dialogs/about.cpp
+ pv/view/analogsignal.cpp
+ pv/view/cursor.cpp
pv/view/header.cpp
pv/view/header.cpp
+ pv/view/logicsignal.cpp
pv/view/ruler.cpp
pv/view/ruler.cpp
+ pv/view/signal.cpp
+ pv/view/timemarker.cpp
pv/view/view.cpp
pv/view/viewport.cpp
)
set(pulseview_HEADERS
pv/view/view.cpp
pv/view/viewport.cpp
)
set(pulseview_HEADERS
- pv/about.h
pv/mainwindow.h
pv/samplingbar.h
pv/sigsession.h
pv/mainwindow.h
pv/samplingbar.h
pv/sigsession.h
+ pv/dialogs/about.h
+ pv/view/cursor.h
pv/view/header.h
pv/view/ruler.h
pv/view/header.h
pv/view/ruler.h
+ pv/view/timemarker.h
pv/view/view.h
pv/view/viewport.h
)
set(pulseview_FORMS
pv/view/view.h
pv/view/viewport.h
)
set(pulseview_FORMS
- pv/about.ui
+ pv/
dialogs/
about.ui
)
set(pulseview_RESOURCES
)
set(pulseview_RESOURCES