X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=test%2FCMakeLists.txt;h=09678e84e87ae87788fbeb1c41ba9a31638a5ec4;hp=edfee7a5bfa85ef7e76819ee64cc450869d60232;hb=de060a86f27bea5d459d4d2d1fc097815cefcd8a;hpb=332c6dd8ebbbd24a5efdf3761f94a48deb9d721a

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index edfee7a5..09678e84 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -20,6 +20,7 @@
 
 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
@@ -97,9 +98,14 @@ 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
@@ -170,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)