X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=test%2FCMakeLists.txt;h=09678e84e87ae87788fbeb1c41ba9a31638a5ec4;hp=7e8a9d7af37906cf64635863fe3f678a249ca628;hb=ae95fe5832e1f3d63d0f0f952629591aae3419cf;hpb=039a381dbd3683ec3879e34a24658a1ea0ddd70f

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7e8a9d7a..09678e84 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -20,22 +20,28 @@
 
 set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/devicemanager.cpp
+	${PROJECT_SOURCE_DIR}/pv/globalsettings.cpp
 	${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/binding/inputoutput.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/signalbase.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/dialogs/connect.cpp
+	${PROJECT_SOURCE_DIR}/pv/dialogs/inputoutputoptions.cpp
+	${PROJECT_SOURCE_DIR}/pv/dialogs/storeprogress.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/bool.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/double.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/enum.cpp
@@ -43,6 +49,8 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/prop/property.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/string.cpp
 	${PROJECT_SOURCE_DIR}/pv/popups/channels.cpp
+	${PROJECT_SOURCE_DIR}/pv/popups/deviceoptions.cpp
+	${PROJECT_SOURCE_DIR}/pv/toolbars/mainbar.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/analogsignal.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/cursor.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/cursorpair.cpp
@@ -68,8 +76,13 @@ set(pulseview_TEST_SOURCES
 	${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/views/viewbase.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/standardbar.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/devicetoolbutton.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/exportmenu.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/importmenu.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/popup.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/popuptoolbutton.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/sweeptimingwidget.cpp
@@ -77,6 +90,7 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.cpp
 	data/analogsegment.cpp
 	data/logicsegment.cpp
+	data/segment.cpp
 	view/ruler.cpp
 	test.cpp
 	util.cpp
@@ -84,10 +98,19 @@ set(pulseview_TEST_SOURCES
 
 # This list includes only QObject derived class headers.
 set(pulseview_TEST_HEADERS
+	${PROJECT_SOURCE_DIR}/pv/globalsettings.hpp
 	${PROJECT_SOURCE_DIR}/pv/session.hpp
 	${PROJECT_SOURCE_DIR}/pv/storesession.hpp
 	${PROJECT_SOURCE_DIR}/pv/binding/device.hpp
+	${PROJECT_SOURCE_DIR}/pv/data/analog.hpp
+	${PROJECT_SOURCE_DIR}/pv/data/analogsegment.hpp
+	${PROJECT_SOURCE_DIR}/pv/data/logic.hpp
+	${PROJECT_SOURCE_DIR}/pv/data/logicsegment.hpp
+	${PROJECT_SOURCE_DIR}/pv/data/signalbase.hpp
 	${PROJECT_SOURCE_DIR}/pv/devices/device.hpp
+	${PROJECT_SOURCE_DIR}/pv/dialogs/connect.hpp
+	${PROJECT_SOURCE_DIR}/pv/dialogs/inputoutputoptions.hpp
+	${PROJECT_SOURCE_DIR}/pv/dialogs/storeprogress.hpp
 	${PROJECT_SOURCE_DIR}/pv/popups/channels.hpp
 	${PROJECT_SOURCE_DIR}/pv/popups/deviceoptions.hpp
 	${PROJECT_SOURCE_DIR}/pv/prop/bool.hpp
@@ -96,6 +119,7 @@ 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/toolbars/mainbar.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/analogsignal.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/cursor.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/flag.hpp
@@ -116,8 +140,13 @@ set(pulseview_TEST_HEADERS
 	${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/views/viewbase.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/standardbar.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/devicetoolbutton.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/exportmenu.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/importmenu.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/popup.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/popuptoolbutton.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/sweeptimingwidget.hpp
@@ -147,16 +176,6 @@ if(ENABLE_DECODE)
 	)
 endif()
 
-if(Qt5Core_FOUND)
-	qt5_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS})
-else()
-	# Workaround 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()
-
 # On MinGW we need to use static linking.
 if(NOT WIN32)
 	add_definitions(-DBOOST_TEST_DYN_LINK)