projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge RowItem() into ViewItem()
[pulseview.git]
/
test
/
CMakeLists.txt
diff --git
a/test/CMakeLists.txt
b/test/CMakeLists.txt
index 300532e11394744e407b124feee4e903fed22ec1..7e753153069323b75eb31ede1e0d4bd57c2fb6e1 100644
(file)
--- a/
test/CMakeLists.txt
+++ b/
test/CMakeLists.txt
@@
-54,6
+54,7
@@
set(pulseview_TEST_SOURCES
${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/prop/string.cpp
${PROJECT_SOURCE_DIR}/pv/popups/channels.cpp
${PROJECT_SOURCE_DIR}/pv/popups/deviceoptions.cpp
+ ${PROJECT_SOURCE_DIR}/pv/subwindows/subwindowbase.cpp
${PROJECT_SOURCE_DIR}/pv/toolbars/mainbar.cpp
${PROJECT_SOURCE_DIR}/pv/views/trace/analogsignal.cpp
${PROJECT_SOURCE_DIR}/pv/views/trace/cursor.cpp
${PROJECT_SOURCE_DIR}/pv/toolbars/mainbar.cpp
${PROJECT_SOURCE_DIR}/pv/views/trace/analogsignal.cpp
${PROJECT_SOURCE_DIR}/pv/views/trace/cursor.cpp
@@
-62,7
+63,6
@@
set(pulseview_TEST_SOURCES
${PROJECT_SOURCE_DIR}/pv/views/trace/header.cpp
${PROJECT_SOURCE_DIR}/pv/views/trace/marginwidget.cpp
${PROJECT_SOURCE_DIR}/pv/views/trace/logicsignal.cpp
${PROJECT_SOURCE_DIR}/pv/views/trace/header.cpp
${PROJECT_SOURCE_DIR}/pv/views/trace/marginwidget.cpp
${PROJECT_SOURCE_DIR}/pv/views/trace/logicsignal.cpp
- ${PROJECT_SOURCE_DIR}/pv/views/trace/rowitem.cpp
${PROJECT_SOURCE_DIR}/pv/views/trace/ruler.cpp
${PROJECT_SOURCE_DIR}/pv/views/trace/signal.cpp
${PROJECT_SOURCE_DIR}/pv/views/trace/timeitem.cpp
${PROJECT_SOURCE_DIR}/pv/views/trace/ruler.cpp
${PROJECT_SOURCE_DIR}/pv/views/trace/signal.cpp
${PROJECT_SOURCE_DIR}/pv/views/trace/timeitem.cpp
@@
-127,6
+127,7
@@
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/prop/int.hpp
${PROJECT_SOURCE_DIR}/pv/prop/property.hpp
${PROJECT_SOURCE_DIR}/pv/prop/string.hpp
+ ${PROJECT_SOURCE_DIR}/pv/subwindows/subwindowbase.cpp
${PROJECT_SOURCE_DIR}/pv/toolbars/mainbar.hpp
${PROJECT_SOURCE_DIR}/pv/views/trace/analogsignal.hpp
${PROJECT_SOURCE_DIR}/pv/views/trace/cursor.hpp
${PROJECT_SOURCE_DIR}/pv/toolbars/mainbar.hpp
${PROJECT_SOURCE_DIR}/pv/views/trace/analogsignal.hpp
${PROJECT_SOURCE_DIR}/pv/views/trace/cursor.hpp
@@
-134,7
+135,6
@@
set(pulseview_TEST_HEADERS
${PROJECT_SOURCE_DIR}/pv/views/trace/header.hpp
${PROJECT_SOURCE_DIR}/pv/views/trace/logicsignal.hpp
${PROJECT_SOURCE_DIR}/pv/views/trace/marginwidget.hpp
${PROJECT_SOURCE_DIR}/pv/views/trace/header.hpp
${PROJECT_SOURCE_DIR}/pv/views/trace/logicsignal.hpp
${PROJECT_SOURCE_DIR}/pv/views/trace/marginwidget.hpp
- ${PROJECT_SOURCE_DIR}/pv/views/trace/rowitem.hpp
${PROJECT_SOURCE_DIR}/pv/views/trace/ruler.hpp
${PROJECT_SOURCE_DIR}/pv/views/trace/signal.hpp
${PROJECT_SOURCE_DIR}/pv/views/trace/timeitem.hpp
${PROJECT_SOURCE_DIR}/pv/views/trace/ruler.hpp
${PROJECT_SOURCE_DIR}/pv/views/trace/signal.hpp
${PROJECT_SOURCE_DIR}/pv/views/trace/timeitem.hpp
@@
-169,6
+169,9
@@
if(ENABLE_DECODE)
${PROJECT_SOURCE_DIR}/pv/data/decode/decoder.cpp
${PROJECT_SOURCE_DIR}/pv/data/decode/row.cpp
${PROJECT_SOURCE_DIR}/pv/data/decode/rowdata.cpp
${PROJECT_SOURCE_DIR}/pv/data/decode/decoder.cpp
${PROJECT_SOURCE_DIR}/pv/data/decode/row.cpp
${PROJECT_SOURCE_DIR}/pv/data/decode/rowdata.cpp
+ ${PROJECT_SOURCE_DIR}/pv/subwindows/decoder_selector/item.cpp
+ ${PROJECT_SOURCE_DIR}/pv/subwindows/decoder_selector/model.cpp
+ ${PROJECT_SOURCE_DIR}/pv/subwindows/decoder_selector/subwindow.cpp
${PROJECT_SOURCE_DIR}/pv/views/trace/decodetrace.cpp
${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.cpp
${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.cpp
${PROJECT_SOURCE_DIR}/pv/views/trace/decodetrace.cpp
${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.cpp
${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.cpp
@@
-176,6
+179,7
@@
if(ENABLE_DECODE)
list(APPEND pulseview_TEST_HEADERS
${PROJECT_SOURCE_DIR}/pv/data/decodesignal.hpp
list(APPEND pulseview_TEST_HEADERS
${PROJECT_SOURCE_DIR}/pv/data/decodesignal.hpp
+ ${PROJECT_SOURCE_DIR}/pv/subwindows/decoder_selector/subwindow.hpp
${PROJECT_SOURCE_DIR}/pv/views/trace/decodetrace.hpp
${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.hpp
${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.hpp
${PROJECT_SOURCE_DIR}/pv/views/trace/decodetrace.hpp
${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.hpp
${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.hpp