X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=test%2FCMakeLists.txt;h=ec833130fc61b9312b64f0eb2b4bfd2afa1687d4;hp=a71d5d16b25274e4154c592aa27a5a08f43f8fcf;hb=f646167f1b6976d78ac5ff0851016c01a3bee14b;hpb=0aad432c15b1b3dc4d156b7e9d682a96cbe3ff54

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a71d5d1..ec83313 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -33,17 +33,27 @@ 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_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
 find_package(Qt4 REQUIRED)
 
 set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/devicemanager.cpp
+	${PROJECT_SOURCE_DIR}/pv/devinst.cpp
 	${PROJECT_SOURCE_DIR}/pv/sigsession.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/cursorpair.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/analog.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/analogsnapshot.cpp
+	${PROJECT_SOURCE_DIR}/pv/data/decode/row.cpp
+	${PROJECT_SOURCE_DIR}/pv/data/decode/rowdata.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/logic.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/logicsnapshot.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/snapshot.cpp
@@ -78,6 +88,7 @@ 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/devinst.h
 	${PROJECT_SOURCE_DIR}/pv/prop/int.h
 	${PROJECT_SOURCE_DIR}/pv/prop/property.h
 	${PROJECT_SOURCE_DIR}/pv/prop/string.h
@@ -124,7 +135,11 @@ if(ENABLE_DECODE)
 	add_definitions(-DENABLE_DECODE)
 endif()
 
+# On MinGW we need to use static linking.
+if(NOT WIN32)
 add_definitions(-DBOOST_TEST_DYN_LINK)
+endif()
+
 add_definitions(${QT_DEFINITIONS})
 
 include_directories(
@@ -139,6 +154,11 @@ set(PULSEVIEW_LINK_LIBS
 	${QT_LIBRARIES}
 )
 
+if(WIN32)
+	# Workaround for a MinGW linking issue.
+	list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2")
+endif()
+
 add_executable(pulseview-test
 	${pulseview_TEST_SOURCES}
 	${pulseview_TEST_HEADERS_MOC}