X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=test%2FCMakeLists.txt;h=4bac48bb7e6adad769a0210533d18885e8527619;hp=9d839cb0970b7d39239df107eaf4f7e01e127fbb;hb=2a21747e9daac2a45cd9a5ceb9a351f9775c5704;hpb=858ae630aec11f2f1300897cc3ca127a4537e598

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9d839cb0..4bac48bb 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -29,7 +29,13 @@ 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.
@@ -49,10 +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/sessionfile.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/double.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/enum.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/int.cpp
@@ -86,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