X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=test%2FCMakeLists.txt;h=7c454c027a1f89a2bb9e8b155025e6850b755308;hp=13bb6dd6aa1c14c56526204a0c3a657f7911b982;hb=2b81ae4682ade4109ffa442794de36ceb32045eb;hpb=8f717aa7b150769d75562a2328cab5b556f7b585

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 13bb6dd6..7c454c02 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.
@@ -81,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/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
-	${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)
@@ -121,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()