X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=test%2FCMakeLists.txt;h=91b85320bc7262601bc4ac97e7b8f3f5d364fd13;hp=3526af69d24b60e7745f33adc21459cc3360e111;hb=474e817a724fdad4db635ba59202283fbcc22ef9;hpb=3a54cb6832da19e463187a9de32a4a20043aa013

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3526af69..91b85320 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -23,6 +23,8 @@ 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
@@ -35,21 +37,17 @@ set(pulseview_TEST_SOURCES
 	${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
-	${PROJECT_SOURCE_DIR}/pv/view/cursorheader.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/cursorpair.cpp
+	${PROJECT_SOURCE_DIR}/pv/view/flag.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/header.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/marginwidget.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/logicsignal.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/rowitem.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/rowitemowner.cpp
-	${PROJECT_SOURCE_DIR}/pv/view/rowitempaintparams.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/ruler.cpp
-	${PROJECT_SOURCE_DIR}/pv/view/selectableitem.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/signal.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/timeitem.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/timemarker.cpp
@@ -57,7 +55,10 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/view/tracegroup.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/tracepalette.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/view.cpp
+	${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
@@ -73,6 +74,7 @@ set(pulseview_TEST_SOURCES
 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/popups/channels.hpp
 	${PROJECT_SOURCE_DIR}/pv/popups/deviceoptions.hpp
 	${PROJECT_SOURCE_DIR}/pv/prop/bool.hpp
@@ -81,22 +83,22 @@ 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/cursorheader.hpp
+	${PROJECT_SOURCE_DIR}/pv/view/flag.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/header.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/logicsignal.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/marginwidget.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/rowitem.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/ruler.hpp
-	${PROJECT_SOURCE_DIR}/pv/view/selectableitem.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/signal.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/timeitem.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/timemarker.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/trace.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/tracegroup.hpp
 	${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
@@ -107,12 +109,12 @@ set(pulseview_TEST_HEADERS
 
 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 +132,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()