projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added sample rate selector
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 3b2df47b4b914786582847aa5cb3ef09e1277fb5..7e13714514242d8c5eecf9b7249e6366718a5783 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-10,20
+10,29
@@
pkg_check_modules(PKGDEPS REQUIRED
)
find_package(Qt4 REQUIRED)
)
find_package(Qt4 REQUIRED)
+find_package(Boost 1.46 REQUIRED)
set(VERSION 0.1.0)
set(sigrok-qt2_SOURCES
about.cpp
set(VERSION 0.1.0)
set(sigrok-qt2_SOURCES
about.cpp
+ datasnapshot.cpp
+ logicdata.cpp
+ logicdatasnapshot.cpp
+ logicsignal.cpp
main.cpp
mainwindow.cpp
main.cpp
mainwindow.cpp
+ samplingbar.cpp
+ signaldata.cpp
sigsession.cpp
sigsession.cpp
+ signal.cpp
sigview.cpp
)
set(sigrok-qt2_HEADERS
about.h
mainwindow.h
sigview.cpp
)
set(sigrok-qt2_HEADERS
about.h
mainwindow.h
+ samplingbar.h
sigsession.h
sigview.h
)
sigsession.h
sigview.h
)
@@
-50,10
+59,12
@@
add_definitions(-DAPP_VERSION="${VERSION}")
include_directories(
${include_directories}
include_directories(
${include_directories}
+ ${Boost_INCLUDE_DIRS}
${PKGDEPS_INCLUDE_DIRS}
)
link_directories(
${PKGDEPS_INCLUDE_DIRS}
)
link_directories(
+ ${Boost_LIBRARY_DIRS}
${PKGDEPS_LIBRARY_DIRS}
)
${PKGDEPS_LIBRARY_DIRS}
)
@@
-65,6
+76,7
@@
add_executable(sigrok-qt2
)
target_link_libraries(sigrok-qt2
)
target_link_libraries(sigrok-qt2
+ ${Boost_LIBRARIES}
${PKGDEPS_LIBRARIES}
${QT_LIBRARIES}
)
${PKGDEPS_LIBRARIES}
${QT_LIBRARIES}
)