Fix #626 by stopping acquisition gracefully

[pulseview.git] / test / CMakeLists.txt

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 98b02999695526b9bb59a47922bcd570aa77224a..726d7070402e8025f591bd17f6330bb48a2d2d3e 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -31,6 +31,11 @@ set(pulseview_TEST_SOURCES
        ${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
@@ -75,6 +80,7 @@ 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
@@ -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()