Fix build on MinGW (boost thread related).

[pulseview.git] / test / CMakeLists.txt

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index adbb55eb76e59430cefd255c37c0951a31dffa49..4bac48bb7e6adad769a0210533d18885e8527619 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -29,7 +29,17 @@ endif()
 find_package(PkgConfig)
 pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
 
-find_package(Boost 1.42 COMPONENTS filesystem system 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 filesystem system thread_win32 unit_test_framework REQUIRED)
+else()
+       find_package(Boost 1.42 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
+endif()
+
+# Find the platform's thread library (needed for C++11 threads).
+# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
+find_package(Threads REQUIRED)
 
 find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
 find_package(Qt4 REQUIRED)
@@ -45,11 +55,6 @@ set(pulseview_TEST_SOURCES
        ${PROJECT_SOURCE_DIR}/pv/data/logicsnapshot.cpp
        ${PROJECT_SOURCE_DIR}/pv/data/snapshot.cpp
        ${PROJECT_SOURCE_DIR}/pv/data/signaldata.cpp
-       ${PROJECT_SOURCE_DIR}/pv/device/device.cpp
-       ${PROJECT_SOURCE_DIR}/pv/device/devinst.cpp
-       ${PROJECT_SOURCE_DIR}/pv/device/file.cpp
-       ${PROJECT_SOURCE_DIR}/pv/device/inputfile.cpp
-       ${PROJECT_SOURCE_DIR}/pv/device/sessionfile.cpp
        ${PROJECT_SOURCE_DIR}/pv/prop/double.cpp
        ${PROJECT_SOURCE_DIR}/pv/prop/enum.cpp
        ${PROJECT_SOURCE_DIR}/pv/prop/int.cpp
@@ -83,12 +88,12 @@ set(pulseview_TEST_SOURCES
 # This list includes only QObject derived class headers.
 set(pulseview_TEST_HEADERS
        ${PROJECT_SOURCE_DIR}/pv/sigsession.h
-       ${PROJECT_SOURCE_DIR}/pv/device/devinst.h
        ${PROJECT_SOURCE_DIR}/pv/prop/double.h
        ${PROJECT_SOURCE_DIR}/pv/prop/enum.h
        ${PROJECT_SOURCE_DIR}/pv/prop/int.h
        ${PROJECT_SOURCE_DIR}/pv/prop/property.h
        ${PROJECT_SOURCE_DIR}/pv/prop/string.h
+       ${PROJECT_SOURCE_DIR}/pv/prop/binding/deviceoptions.h
        ${PROJECT_SOURCE_DIR}/pv/view/cursor.h
        ${PROJECT_SOURCE_DIR}/pv/view/cursorheader.h
        ${PROJECT_SOURCE_DIR}/pv/view/header.h
@@ -137,7 +142,7 @@ endif()
 
 # On MinGW we need to use static linking.
 if(NOT WIN32)
-add_definitions(-DBOOST_TEST_DYN_LINK)
+       add_definitions(-DBOOST_TEST_DYN_LINK)
 endif()
 
 add_definitions(${QT_DEFINITIONS})
@@ -151,6 +156,7 @@ set(PULSEVIEW_LINK_LIBS
        ${Boost_LIBRARIES}
        ${PKGDEPS_LIBRARIES}
        ${QT_LIBRARIES}
+       ${CMAKE_THREAD_LIBS_INIT}
 )
 
 if(WIN32)