X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=test%2FCMakeLists.txt;h=ba1cce29c35099b0e05c552e1ce6342a7711d3db;hb=1c4a9ec1780cf0d0b0e1eaa63292201523e94672;hp=de2ef909cf86fdf7af5d07ebc1acd337a42b2b20;hpb=269528f55e7fd77f762c2008d257921cd30e1519;p=pulseview.git diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index de2ef90..ba1cce2 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -33,9 +33,16 @@ pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS}) # This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value. find_package(Threads) -find_package(Boost 1.42 COMPONENTS system thread unit_test_framework REQUIRED) +if(WIN32) + # On Windows/MinGW we need to use 'thread_win32' instead of 'thread'. + # The library is named libboost_thread_win32* (not libboost_thread*). + find_package(Boost 1.42 COMPONENTS system thread_win32 unit_test_framework REQUIRED) +else() + find_package(Boost 1.42 COMPONENTS system thread unit_test_framework REQUIRED) +endif() + -FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac) +find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac) find_package(Qt4 REQUIRED) set(pulseview_TEST_SOURCES @@ -75,7 +82,7 @@ set(pulseview_TEST_SOURCES test.cpp ) -# This list includes only QObject derrived class headers +# This list includes only QObject derived class headers. set(pulseview_TEST_HEADERS ${PROJECT_SOURCE_DIR}/pv/sigsession.h ${PROJECT_SOURCE_DIR}/pv/prop/int.h