X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=6848be500153ac15381d6082391ab041fc92d825;hp=036946c360984204b0dc7b8ec59abe9ed495831c;hb=7a01bd3654ed046216308fa64edfd79be7cd525f;hpb=ad341c3a893c66cfd59ac66eedb1de405ed0dbbb

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 036946c3..6848be50 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)
@@ -146,6 +146,8 @@ set(pulseview_SOURCES
 	pv/session.cpp
 	pv/storesession.cpp
 	pv/util.cpp
+	pv/binding/binding.cpp
+	pv/binding/device.cpp
 	pv/data/analog.cpp
 	pv/data/analogsegment.cpp
 	pv/data/logic.cpp
@@ -163,21 +165,17 @@ set(pulseview_SOURCES
 	pv/prop/int.cpp
 	pv/prop/property.cpp
 	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/rowitempaintparams.cpp
 	pv/view/ruler.cpp
-	pv/view/selectableitem.cpp
 	pv/view/signal.cpp
 	pv/view/timeitem.cpp
 	pv/view/timemarker.cpp
@@ -185,9 +183,15 @@ set(pulseview_SOURCES
 	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
@@ -199,6 +203,7 @@ set(pulseview_HEADERS
 	pv/mainwindow.hpp
 	pv/session.hpp
 	pv/storesession.hpp
+	pv/binding/device.hpp
 	pv/dialogs/about.hpp
 	pv/dialogs/connect.hpp
 	pv/dialogs/storeprogress.hpp
@@ -210,25 +215,28 @@ set(pulseview_HEADERS
 	pv/prop/int.hpp
 	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
@@ -250,12 +258,12 @@ endif()
 
 if(ENABLE_DECODE)
 	list(APPEND pulseview_SOURCES
+		pv/binding/decoder.cpp
 		pv/data/decoderstack.cpp
 		pv/data/decode/annotation.cpp
 		pv/data/decode/decoder.cpp
 		pv/data/decode/row.cpp
 		pv/data/decode/rowdata.cpp
-		pv/prop/binding/decoderoptions.cpp
 		pv/view/decodetrace.cpp
 		pv/widgets/decodergroupbox.cpp
 		pv/widgets/decodermenu.cpp