projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
009e150
)
Added a dependency on boost
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sun, 2 Sep 2012 12:32:38 +0000
(13:32 +0100)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Mon, 3 Sep 2012 12:49:39 +0000
(13:49 +0100)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 3b2df47b4b914786582847aa5cb3ef09e1277fb5..d6c7f8f56d30d40e3314cc45a52a3e224ccf7211 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-10,6
+10,7
@@
pkg_check_modules(PKGDEPS REQUIRED
)
find_package(Qt4 REQUIRED)
+find_package(Boost 1.46 REQUIRED)
set(VERSION 0.1.0)
@@
-50,10
+51,12
@@
add_definitions(-DAPP_VERSION="${VERSION}")
include_directories(
${include_directories}
+ ${Boost_INCLUDE_DIRS}
${PKGDEPS_INCLUDE_DIRS}
)
link_directories(
+ ${Boost_LIBRARY_DIRS}
${PKGDEPS_LIBRARY_DIRS}
)
@@
-65,6
+68,7
@@
add_executable(sigrok-qt2
)
target_link_libraries(sigrok-qt2
+ ${Boost_LIBRARIES}
${PKGDEPS_LIBRARIES}
${QT_LIBRARIES}
)