X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=test%2FCMakeLists.txt;h=f2262b4a71c7bdfed60a0b595b922c32fe76858b;hb=806d3e1eb3d60e93ff95d23e79588a0486730967;hp=98b02999695526b9bb59a47922bcd570aa77224a;hpb=3cc9ad7b867853315473df611612c562d562ed8a;p=pulseview.git

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 98b0299..f2262b4 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -31,6 +31,11 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/data/logicsegment.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/segment.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/signaldata.cpp
+	${PROJECT_SOURCE_DIR}/pv/devices/device.cpp
+	${PROJECT_SOURCE_DIR}/pv/devices/file.cpp
+	${PROJECT_SOURCE_DIR}/pv/devices/hardwaredevice.cpp
+	${PROJECT_SOURCE_DIR}/pv/devices/inputfile.cpp
+	${PROJECT_SOURCE_DIR}/pv/devices/sessionfile.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/bool.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/double.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/enum.cpp
@@ -64,10 +69,12 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/widgets/popup.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/popuptoolbutton.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/sweeptimingwidget.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/timestampspinbox.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.cpp
 	data/analogsegment.cpp
 	data/logicsegment.cpp
 	test.cpp
+	util.cpp
 )
 
 # This list includes only QObject derived class headers.
@@ -75,6 +82,7 @@ set(pulseview_TEST_HEADERS
 	${PROJECT_SOURCE_DIR}/pv/session.hpp
 	${PROJECT_SOURCE_DIR}/pv/storesession.hpp
 	${PROJECT_SOURCE_DIR}/pv/binding/device.hpp
+	${PROJECT_SOURCE_DIR}/pv/devices/device.hpp
 	${PROJECT_SOURCE_DIR}/pv/popups/channels.hpp
 	${PROJECT_SOURCE_DIR}/pv/popups/deviceoptions.hpp
 	${PROJECT_SOURCE_DIR}/pv/prop/bool.hpp
@@ -104,6 +112,7 @@ set(pulseview_TEST_HEADERS
 	${PROJECT_SOURCE_DIR}/pv/widgets/popup.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/popuptoolbutton.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/sweeptimingwidget.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/timestampspinbox.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.hpp
 )
 
@@ -132,7 +141,10 @@ endif()
 if(Qt5Core_FOUND)
 	qt5_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS})
 else()
-	qt4_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS})
+	# Workaroud for QTBUG-22829: -DBOOST_NEXT_PRIOR_HPP_INCLUDED.
+	# https://bugreports.qt.io/browse/QTBUG-22829
+	qt4_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS}
+		OPTIONS -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
 	include(${QT_USE_FILE})
 endif()