X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=78acee6163836d1d44eb1faa2564450f1152ed87;hp=a66a95bd871e9ecb3e06e495ce0e16826e1fefbd;hb=ce6001b8b3b21778218f07549b165ac848ceffd2;hpb=e6fd809f20855828c4f393a0e0659d65818d79c7 diff --git a/CMakeLists.txt b/CMakeLists.txt index a66a95bd..78acee61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,7 @@ endif() #= Dependencies #------------------------------------------------------------------------------- -list(APPEND PKGDEPS libsigrokxx>=0.3.0) +list(APPEND PKGDEPS libsigrokcxx>=0.3.0) if(ENABLE_DECODE) list(APPEND PKGDEPS libsigrokdecode>=0.3.0) @@ -147,11 +147,11 @@ set(pulseview_SOURCES pv/storesession.cpp pv/util.cpp pv/data/analog.cpp - pv/data/analogsnapshot.cpp + pv/data/analogsegment.cpp pv/data/logic.cpp - pv/data/logicsnapshot.cpp + pv/data/logicsegment.cpp pv/data/signaldata.cpp - pv/data/snapshot.cpp + pv/data/segment.cpp pv/dialogs/about.cpp pv/dialogs/connect.cpp pv/dialogs/storeprogress.cpp @@ -165,27 +165,33 @@ set(pulseview_SOURCES pv/prop/string.cpp pv/prop/binding/binding.cpp pv/prop/binding/deviceoptions.cpp - pv/toolbars/samplingbar.cpp + pv/toolbars/mainbar.cpp pv/view/analogsignal.cpp pv/view/cursor.cpp - pv/view/cursorheader.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/ruler.cpp - pv/view/selectableitem.cpp pv/view/signal.cpp + pv/view/timeitem.cpp pv/view/timemarker.cpp pv/view/trace.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/viewwidget.cpp pv/widgets/colourbutton.cpp pv/widgets/colourpopup.cpp + pv/widgets/devicetoolbutton.cpp + pv/widgets/exportmenu.cpp + pv/widgets/hidingmenubar.cpp pv/widgets/popup.cpp pv/widgets/popuptoolbutton.cpp pv/widgets/sweeptimingwidget.cpp @@ -209,23 +215,28 @@ set(pulseview_HEADERS pv/prop/property.hpp pv/prop/string.hpp pv/prop/binding/deviceoptions.hpp - pv/toolbars/samplingbar.hpp + pv/toolbars/mainbar.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/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/viewitem.hpp pv/view/viewport.hpp + pv/view/viewwidget.hpp pv/widgets/colourbutton.hpp pv/widgets/colourpopup.hpp + pv/widgets/devicetoolbutton.hpp + pv/widgets/exportmenu.hpp + pv/widgets/hidingmenubar.hpp pv/widgets/popup.hpp pv/widgets/popuptoolbutton.hpp pv/widgets/sweeptimingwidget.hpp