X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=test%2FCMakeLists.txt;h=96d5b1fdd16b5a138d42d9489a45ea83ea07802c;hb=496b72053bbf902955643f0deba694073facf8fe;hp=de2ef909cf86fdf7af5d07ebc1acd337a42b2b20;hpb=269528f55e7fd77f762c2008d257921cd30e1519;p=pulseview.git

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index de2ef90..96d5b1f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -20,22 +20,18 @@
 
 option(ENABLE_DECODE "Build with libsigrokdecode" FALSE)
 
-list(APPEND PKGDEPS libsigrok>=0.2.0)
+list(APPEND PKGDEPS libsigrok>=0.3.0)
 
 if(ENABLE_DECODE)
-	list(APPEND PKGDEPS libsigrokdecode>=0.2.0)
+	list(APPEND PKGDEPS libsigrokdecode>=0.3.0)
 endif()
 
 find_package(PkgConfig)
 pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
 
-# Find the platform's thread library (needed for boost-thread).
-# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
-find_package(Threads)
+find_package(Boost 1.42 COMPONENTS filesystem system unit_test_framework REQUIRED)
 
-find_package(Boost 1.42 COMPONENTS system thread unit_test_framework REQUIRED)
-
-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
@@ -48,6 +44,13 @@ 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
 	${PROJECT_SOURCE_DIR}/pv/prop/property.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/string.cpp
@@ -75,9 +78,12 @@ set(pulseview_TEST_SOURCES
 	test.cpp
 )
 
-# This list includes only QObject derrived class headers
+# 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
@@ -101,8 +107,10 @@ set(pulseview_TEST_HEADERS
 if(ENABLE_DECODE)
 	list(APPEND pulseview_TEST_SOURCES
 		${PROJECT_SOURCE_DIR}/pv/data/decoderstack.cpp
-		${PROJECT_SOURCE_DIR}/pv/data/decode/decoder.cpp
 		${PROJECT_SOURCE_DIR}/pv/data/decode/annotation.cpp
+		${PROJECT_SOURCE_DIR}/pv/data/decode/decoder.cpp
+		${PROJECT_SOURCE_DIR}/pv/data/decode/row.cpp
+		${PROJECT_SOURCE_DIR}/pv/data/decode/rowdata.cpp
 		${PROJECT_SOURCE_DIR}/pv/prop/binding/decoderoptions.cpp
 		${PROJECT_SOURCE_DIR}/pv/view/decodetrace.cpp
 		${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.cpp
@@ -124,7 +132,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(
@@ -134,11 +146,15 @@ include_directories(
 
 set(PULSEVIEW_LINK_LIBS
 	${Boost_LIBRARIES}
-	${CMAKE_THREAD_LIBS_INIT}
 	${PKGDEPS_LIBRARIES}
 	${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}