projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
buildsystem: Link against the platform's thread library
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 4448260b6bafc31737ec30505ee308cb78cf148c..ebe156d56e5dc902480bbeff3794ba4ab7d831e3 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-2,7
+2,7
@@
## This file is part of the PulseView project.
##
## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
## This file is part of the PulseView project.
##
## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
-## Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
+## Copyright (C) 2012
-2013
Alexandru Gagniuc <mr.nuke.me@gmail.com>
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@
-53,6
+53,10
@@
pkg_check_modules(PKGDEPS REQUIRED
find_package(Qt4 REQUIRED)
find_package(Qt4 REQUIRED)
+# Find the platform's thread library (needed for boost-thread).
+# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
+find_package(Threads)
+
if(WIN32)
# On Windows/MinGW the we need to use 'thread_win32' instead of 'thread'.
# The library is named libboost_thread_win32* (not libboost_thread*).
if(WIN32)
# On Windows/MinGW the we need to use 'thread_win32' instead of 'thread'.
# The library is named libboost_thread_win32* (not libboost_thread*).
@@
-174,6
+178,7
@@
link_directories(${Boost_LIBRARY_DIRS})
set(PULSEVIEW_LINK_LIBS
${Boost_LIBRARIES}
set(PULSEVIEW_LINK_LIBS
${Boost_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT}
${QT_LIBRARIES}
)
${QT_LIBRARIES}
)