From c0aa7d313610b13ba7f38b5f9f627ba71655fd9c Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Tue, 21 Jan 2014 20:31:14 +0100 Subject: [PATCH] test/CMakeLists.txt: Fix build on Windows/MinGW. 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 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 84245bb..ba1cce2 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -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) -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) -- 2.30.2