X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=test%2FCMakeLists.txt;h=adbb55eb76e59430cefd255c37c0951a31dffa49;hb=3fe44dc6ada6c6e2ed771ab09dbedff7148fd053;hp=57ca26f0026de927c6fb60a0c77e3fd2271ed415;hpb=a9a88468dcac5f2de138f9dc4ffd0935d6927e06;p=pulseview.git

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 57ca26f..adbb55e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -20,27 +20,16 @@
 
 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)
-
-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_package(Boost 1.42 COMPONENTS filesystem system unit_test_framework REQUIRED)
 
 find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
 find_package(Qt4 REQUIRED)
@@ -48,6 +37,7 @@ find_package(Qt4 REQUIRED)
 set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/devicemanager.cpp
 	${PROJECT_SOURCE_DIR}/pv/sigsession.cpp
+	${PROJECT_SOURCE_DIR}/pv/util.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/cursorpair.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/analog.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/analogsnapshot.cpp
@@ -55,12 +45,20 @@ 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
 	${PROJECT_SOURCE_DIR}/pv/prop/binding/binding.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/analogsignal.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/cursor.cpp
+	${PROJECT_SOURCE_DIR}/pv/view/cursorheader.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/cursorpair.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/header.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/logicsignal.cpp
@@ -85,10 +83,14 @@ 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
@@ -108,8 +110,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
@@ -145,11 +149,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}