projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LogicSignal: Check the TRIGGER_MATCH key before listing
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 036946c360984204b0dc7b8ec59abe9ed495831c..667574754d9233ae0bd20fa8c69d2f8d7c79cdf5 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-65,7
+65,7
@@
endif()
#= Dependencies
#-------------------------------------------------------------------------------
#= Dependencies
#-------------------------------------------------------------------------------
-list(APPEND PKGDEPS libsigrokxx>=0.3.0)
+list(APPEND PKGDEPS libsigrok
c
xx>=0.3.0)
if(ENABLE_DECODE)
list(APPEND PKGDEPS libsigrokdecode>=0.3.0)
if(ENABLE_DECODE)
list(APPEND PKGDEPS libsigrokdecode>=0.3.0)
@@
-165,19
+165,17
@@
set(pulseview_SOURCES
pv/prop/string.cpp
pv/prop/binding/binding.cpp
pv/prop/binding/deviceoptions.cpp
pv/prop/string.cpp
pv/prop/binding/binding.cpp
pv/prop/binding/deviceoptions.cpp
- pv/toolbars/
sampling
bar.cpp
+ pv/toolbars/
main
bar.cpp
pv/view/analogsignal.cpp
pv/view/cursor.cpp
pv/view/analogsignal.cpp
pv/view/cursor.cpp
- pv/view/cursorheader.cpp
pv/view/cursorpair.cpp
pv/view/cursorpair.cpp
+ pv/view/flag.cpp
pv/view/header.cpp
pv/view/marginwidget.cpp
pv/view/logicsignal.cpp
pv/view/rowitem.cpp
pv/view/rowitemowner.cpp
pv/view/header.cpp
pv/view/marginwidget.cpp
pv/view/logicsignal.cpp
pv/view/rowitem.cpp
pv/view/rowitemowner.cpp
- pv/view/rowitempaintparams.cpp
pv/view/ruler.cpp
pv/view/ruler.cpp
- pv/view/selectableitem.cpp
pv/view/signal.cpp
pv/view/timeitem.cpp
pv/view/timemarker.cpp
pv/view/signal.cpp
pv/view/timeitem.cpp
pv/view/timemarker.cpp
@@
-185,9
+183,14
@@
set(pulseview_SOURCES
pv/view/tracegroup.cpp
pv/view/tracepalette.cpp
pv/view/view.cpp
pv/view/tracegroup.cpp
pv/view/tracepalette.cpp
pv/view/view.cpp
+ pv/view/viewitem.cpp
+ pv/view/viewitempaintparams.cpp
pv/view/viewport.cpp
pv/view/viewport.cpp
+ pv/view/viewwidget.cpp
pv/widgets/colourbutton.cpp
pv/widgets/colourpopup.cpp
pv/widgets/colourbutton.cpp
pv/widgets/colourpopup.cpp
+ pv/widgets/devicetoolbutton.cpp
+ pv/widgets/hidingmenubar.cpp
pv/widgets/popup.cpp
pv/widgets/popuptoolbutton.cpp
pv/widgets/sweeptimingwidget.cpp
pv/widgets/popup.cpp
pv/widgets/popuptoolbutton.cpp
pv/widgets/sweeptimingwidget.cpp
@@
-211,24
+214,27
@@
set(pulseview_HEADERS
pv/prop/property.hpp
pv/prop/string.hpp
pv/prop/binding/deviceoptions.hpp
pv/prop/property.hpp
pv/prop/string.hpp
pv/prop/binding/deviceoptions.hpp
- pv/toolbars/
sampling
bar.hpp
+ pv/toolbars/
main
bar.hpp
pv/view/cursor.hpp
pv/view/cursor.hpp
- pv/view/
cursorheader
.hpp
+ pv/view/
flag
.hpp
pv/view/header.hpp
pv/view/logicsignal.hpp
pv/view/marginwidget.hpp
pv/view/rowitem.hpp
pv/view/ruler.hpp
pv/view/header.hpp
pv/view/logicsignal.hpp
pv/view/marginwidget.hpp
pv/view/rowitem.hpp
pv/view/ruler.hpp
- pv/view/selectableitem.hpp
pv/view/signal.hpp
pv/view/timeitem.hpp
pv/view/timemarker.hpp
pv/view/trace.hpp
pv/view/tracegroup.hpp
pv/view/view.hpp
pv/view/signal.hpp
pv/view/timeitem.hpp
pv/view/timemarker.hpp
pv/view/trace.hpp
pv/view/tracegroup.hpp
pv/view/view.hpp
+ pv/view/viewitem.hpp
pv/view/viewport.hpp
pv/view/viewport.hpp
+ pv/view/viewwidget.hpp
pv/widgets/colourbutton.hpp
pv/widgets/colourpopup.hpp
pv/widgets/colourbutton.hpp
pv/widgets/colourpopup.hpp
+ pv/widgets/devicetoolbutton.hpp
+ pv/widgets/hidingmenubar.hpp
pv/widgets/popup.hpp
pv/widgets/popuptoolbutton.hpp
pv/widgets/sweeptimingwidget.hpp
pv/widgets/popup.hpp
pv/widgets/popuptoolbutton.hpp
pv/widgets/sweeptimingwidget.hpp