projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #685 by adding a special T marker when SR_DT_TRIGGER arrives
[pulseview.git]
/
test
/
CMakeLists.txt
diff --git
a/test/CMakeLists.txt
b/test/CMakeLists.txt
index 98b02999695526b9bb59a47922bcd570aa77224a..c1ed3df39fdd0e1608841edd808b5e60ae24cf9e 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/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
${PROJECT_SOURCE_DIR}/pv/prop/bool.cpp
${PROJECT_SOURCE_DIR}/pv/prop/double.cpp
${PROJECT_SOURCE_DIR}/pv/prop/enum.cpp
@@
-46,16
+51,19
@@
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/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/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/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/view.cpp
${PROJECT_SOURCE_DIR}/pv/view/viewitem.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/view/viewitempaintparams.cpp
${PROJECT_SOURCE_DIR}/pv/view/viewport.cpp
${PROJECT_SOURCE_DIR}/pv/view/viewwidget.cpp
@@
-64,10
+72,13
@@
set(pulseview_TEST_SOURCES
${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/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
${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.cpp
data/analogsegment.cpp
data/logicsegment.cpp
+ view/ruler.cpp
test.cpp
test.cpp
+ util.cpp
)
# This list includes only QObject derived class headers.
)
# This list includes only QObject derived class headers.
@@
-75,6
+86,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/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
${PROJECT_SOURCE_DIR}/pv/popups/channels.hpp
${PROJECT_SOURCE_DIR}/pv/popups/deviceoptions.hpp
${PROJECT_SOURCE_DIR}/pv/prop/bool.hpp
@@
-91,10
+103,12
@@
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/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/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/view.hpp
${PROJECT_SOURCE_DIR}/pv/view/viewitem.hpp
${PROJECT_SOURCE_DIR}/pv/view/viewport.hpp
${PROJECT_SOURCE_DIR}/pv/view/view.hpp
${PROJECT_SOURCE_DIR}/pv/view/viewitem.hpp
${PROJECT_SOURCE_DIR}/pv/view/viewport.hpp
@@
-104,6
+118,7
@@
set(pulseview_TEST_HEADERS
${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/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
)
${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.hpp
)
@@
-132,7
+147,10
@@
endif()
if(Qt5Core_FOUND)
qt5_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS})
else()
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()
include(${QT_USE_FILE})
endif()