]> sigrok.org Git - pulseview.git/commitdiff
test/CMakeLists.txt: Fix build on Windows/MinGW.
authorUwe Hermann <redacted>
Tue, 21 Jan 2014 19:31:14 +0000 (20:31 +0100)
committerUwe Hermann <redacted>
Tue, 21 Jan 2014 19:31:14 +0000 (20:31 +0100)
On Windows/MinGW we need to use Boost's 'thread_win32' instead of
'thread' (was already done in the main CMakeLists.txt, but not yet
in test/CMakeLists.txt).

test/CMakeLists.txt

index 84245bb71f64a7e55030897ae01145a6fa2ab4c8..ba1cce29c35099b0e05c552e1ce6342a7711d3db 100644 (file)
@@ -33,7 +33,14 @@ pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
 # This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
 find_package(Threads)
 
 # 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_package(Qt4 REQUIRED)
 
 find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
 find_package(Qt4 REQUIRED)