Renamed pv::binding::DeviceOptions and DecoderOptions to Device and Decoder

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e621a1f04a08726ce863b86017e862ec841f26b..6848be500153ac15381d6082391ab041fc92d825 100644 (file)
--- 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,8 +165,6 @@ 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/mainbar.cpp
        pv/view/analogsignal.cpp
        pv/view/cursor.cpp
@@ -190,6 +190,8 @@ set(pulseview_SOURCES
        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
@@ -201,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
@@ -212,7 +215,6 @@ set(pulseview_HEADERS
        pv/prop/int.hpp
        pv/prop/property.hpp
        pv/prop/string.hpp
-       pv/prop/binding/deviceoptions.hpp
        pv/toolbars/mainbar.hpp
        pv/view/cursor.hpp
        pv/view/flag.hpp
@@ -233,6 +235,8 @@ set(pulseview_HEADERS
        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
@@ -254,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