X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=test%2FCMakeLists.txt;h=7c454c027a1f89a2bb9e8b155025e6850b755308;hb=e0e560a5b61ce41b1907d699911cae86a793d5d7;hp=adbb55eb76e59430cefd255c37c0951a31dffa49;hpb=3fe44dc6ada6c6e2ed771ab09dbedff7148fd053;p=pulseview.git

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index adbb55eb..7c454c02 100644
--- 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
@@ -82,29 +87,29 @@ 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/view/cursor.h
-	${PROJECT_SOURCE_DIR}/pv/view/cursorheader.h
-	${PROJECT_SOURCE_DIR}/pv/view/header.h
-	${PROJECT_SOURCE_DIR}/pv/view/logicsignal.h
-	${PROJECT_SOURCE_DIR}/pv/view/marginwidget.h
-	${PROJECT_SOURCE_DIR}/pv/view/ruler.h
-	${PROJECT_SOURCE_DIR}/pv/view/selectableitem.h
-	${PROJECT_SOURCE_DIR}/pv/view/signal.h
-	${PROJECT_SOURCE_DIR}/pv/view/timemarker.h
-	${PROJECT_SOURCE_DIR}/pv/view/trace.h
-	${PROJECT_SOURCE_DIR}/pv/view/view.h
-	${PROJECT_SOURCE_DIR}/pv/view/viewport.h
-	${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.h
-	${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.h
-	${PROJECT_SOURCE_DIR}/pv/widgets/popup.h
-	${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.h
+	${PROJECT_SOURCE_DIR}/pv/sigsession.hpp
+	${PROJECT_SOURCE_DIR}/pv/prop/double.hpp
+	${PROJECT_SOURCE_DIR}/pv/prop/enum.hpp
+	${PROJECT_SOURCE_DIR}/pv/prop/int.hpp
+	${PROJECT_SOURCE_DIR}/pv/prop/property.hpp
+	${PROJECT_SOURCE_DIR}/pv/prop/string.hpp
+	${PROJECT_SOURCE_DIR}/pv/prop/binding/deviceoptions.hpp
+	${PROJECT_SOURCE_DIR}/pv/view/cursor.hpp
+	${PROJECT_SOURCE_DIR}/pv/view/cursorheader.hpp
+	${PROJECT_SOURCE_DIR}/pv/view/header.hpp
+	${PROJECT_SOURCE_DIR}/pv/view/logicsignal.hpp
+	${PROJECT_SOURCE_DIR}/pv/view/marginwidget.hpp
+	${PROJECT_SOURCE_DIR}/pv/view/ruler.hpp
+	${PROJECT_SOURCE_DIR}/pv/view/selectableitem.hpp
+	${PROJECT_SOURCE_DIR}/pv/view/signal.hpp
+	${PROJECT_SOURCE_DIR}/pv/view/timemarker.hpp
+	${PROJECT_SOURCE_DIR}/pv/view/trace.hpp
+	${PROJECT_SOURCE_DIR}/pv/view/view.hpp
+	${PROJECT_SOURCE_DIR}/pv/view/viewport.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/popup.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.hpp
 )
 
 if(ENABLE_DECODE)
@@ -122,10 +127,10 @@ if(ENABLE_DECODE)
 	)
 
 	list(APPEND pulseview_TEST_HEADERS
-		${PROJECT_SOURCE_DIR}/pv/data/decoderstack.h
-		${PROJECT_SOURCE_DIR}/pv/view/decodetrace.h
-		${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.h
-		${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.h
+		${PROJECT_SOURCE_DIR}/pv/data/decoderstack.hpp
+		${PROJECT_SOURCE_DIR}/pv/view/decodetrace.hpp
+		${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.hpp
+		${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.hpp
 	)
 endif()
 
@@ -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)