X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=test%2FCMakeLists.txt;h=726d7070402e8025f591bd17f6330bb48a2d2d3e;hb=96b6316ab8ed24551a0affb7a5819d1c97147a5c;hp=61b9c4d505b4ebaf1e4a59a34fdd7af7d367a739;hpb=61703a0124c7ace84caf415f7d491a3ad6f42599;p=pulseview.git

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 61b9c4d5..726d7070 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -24,13 +24,18 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/storesession.cpp
 	${PROJECT_SOURCE_DIR}/pv/util.cpp
 	${PROJECT_SOURCE_DIR}/pv/binding/binding.cpp
-	${PROJECT_SOURCE_DIR}/pv/binding/deviceoptions.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
@@ -74,7 +79,8 @@ 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/deviceoptions.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
@@ -109,7 +115,7 @@ set(pulseview_TEST_HEADERS
 
 if(ENABLE_DECODE)
 	list(APPEND pulseview_TEST_SOURCES
-		${PROJECT_SOURCE_DIR}/pv/binding/decoderoptions.cpp
+		${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
@@ -132,7 +138,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()