X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=test%2FCMakeLists.txt;h=05b5cb4b0be21fad00c83135f93419e3b8d8597a;hp=61b9c4d505b4ebaf1e4a59a34fdd7af7d367a739;hb=326cf6feb8598aa03a35fd6f678e4f536f168149;hpb=61703a0124c7ace84caf415f7d491a3ad6f42599 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 61b9c4d5..05b5cb4b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -20,17 +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/deviceoptions.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 @@ -38,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 @@ -46,35 +59,58 @@ set(pulseview_TEST_SOURCES ${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/ruler.cpp ${PROJECT_SOURCE_DIR}/pv/view/signal.cpp + ${PROJECT_SOURCE_DIR}/pv/view/signalscalehandle.cpp ${PROJECT_SOURCE_DIR}/pv/view/timeitem.cpp ${PROJECT_SOURCE_DIR}/pv/view/timemarker.cpp ${PROJECT_SOURCE_DIR}/pv/view/trace.cpp ${PROJECT_SOURCE_DIR}/pv/view/tracegroup.cpp ${PROJECT_SOURCE_DIR}/pv/view/tracepalette.cpp + ${PROJECT_SOURCE_DIR}/pv/view/tracetreeitem.cpp + ${PROJECT_SOURCE_DIR}/pv/view/tracetreeitemowner.cpp + ${PROJECT_SOURCE_DIR}/pv/view/triggermarker.cpp ${PROJECT_SOURCE_DIR}/pv/view/view.cpp ${PROJECT_SOURCE_DIR}/pv/view/viewitem.cpp + ${PROJECT_SOURCE_DIR}/pv/view/viewitemowner.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/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 + ${PROJECT_SOURCE_DIR}/pv/widgets/timestampspinbox.cpp ${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.cpp data/analogsegment.cpp data/logicsegment.cpp + data/segment.cpp + view/ruler.cpp test.cpp + util.cpp ) # 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/deviceoptions.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 @@ -83,6 +119,8 @@ 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 ${PROJECT_SOURCE_DIR}/pv/view/header.hpp @@ -91,25 +129,34 @@ set(pulseview_TEST_HEADERS ${PROJECT_SOURCE_DIR}/pv/view/rowitem.hpp ${PROJECT_SOURCE_DIR}/pv/view/ruler.hpp ${PROJECT_SOURCE_DIR}/pv/view/signal.hpp + ${PROJECT_SOURCE_DIR}/pv/view/signalscalehandle.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/tracetreeitem.hpp + ${PROJECT_SOURCE_DIR}/pv/view/triggermarker.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/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 + ${PROJECT_SOURCE_DIR}/pv/widgets/timestampspinbox.hpp ${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.hpp ) 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 +179,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}) + # 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()