X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=test%2FCMakeLists.txt;h=65182e11254dd8db0dbba02d37252d52eb5aa3b7;hp=446c868b253ae8a7b5eb4816fc5fcb54560a2b19;hb=c677193dc6e691493081fe87476a04e1674093a5;hpb=819e2e95555b2b3c2190f24a3cfa82250d1f34e5

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 446c868b..65182e11 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -23,20 +23,25 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/session.cpp
 	${PROJECT_SOURCE_DIR}/pv/storesession.cpp
 	${PROJECT_SOURCE_DIR}/pv/util.cpp
+	${PROJECT_SOURCE_DIR}/pv/binding/binding.cpp
+	${PROJECT_SOURCE_DIR}/pv/binding/device.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/analog.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/analogsegment.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/logic.cpp
 	${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
 	${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/prop/binding/deviceoptions.cpp
 	${PROJECT_SOURCE_DIR}/pv/popups/channels.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/analogsignal.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/cursor.cpp
@@ -58,21 +63,27 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/view/viewitem.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/viewitempaintparams.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/viewport.cpp
+	${PROJECT_SOURCE_DIR}/pv/view/viewwidget.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.cpp
 	${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
+	view/ruler.cpp
 	test.cpp
+	util.cpp
 )
 
 # This list includes only QObject derived class headers.
 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
@@ -81,7 +92,6 @@ set(pulseview_TEST_HEADERS
 	${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/flag.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/header.hpp
@@ -97,22 +107,24 @@ set(pulseview_TEST_HEADERS
 	${PROJECT_SOURCE_DIR}/pv/view/view.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/viewitem.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/viewport.hpp
+	${PROJECT_SOURCE_DIR}/pv/view/viewwidget.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/popuptoolbutton.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/sweeptimingwidget.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/timestampspinbox.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.hpp
 )
 
 if(ENABLE_DECODE)
 	list(APPEND pulseview_TEST_SOURCES
+		${PROJECT_SOURCE_DIR}/pv/binding/decoder.cpp
 		${PROJECT_SOURCE_DIR}/pv/data/decoderstack.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
 		${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.cpp
@@ -130,7 +142,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()