X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=ebe156d56e5dc902480bbeff3794ba4ab7d831e3;hp=4448260b6bafc31737ec30505ee308cb78cf148c;hb=3933e8a901740de80133f15daf3d114867c08e0c;hpb=c43d09e03d3e50aabb05f8026fa895a8e6aeca95 diff --git a/CMakeLists.txt b/CMakeLists.txt index 4448260..ebe156d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ ## This file is part of the PulseView project. ## ## Copyright (C) 2012 Joel Holdsworth -## Copyright (C) 2012 Alexandru Gagniuc +## Copyright (C) 2012-2013 Alexandru Gagniuc ## ## 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 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*). @@ -174,6 +178,7 @@ link_directories(${Boost_LIBRARY_DIRS}) set(PULSEVIEW_LINK_LIBS ${Boost_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ${QT_LIBRARIES} )