LogicSignal: Tidied up forward declarations

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f9009abf4e7eca49172d75be855bdb13f01d46a..fdc5b69cd035a82315ad94d919a01985f399da7e 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,9 @@ set(pulseview_SOURCES
        pv/session.cpp
        pv/storesession.cpp
        pv/util.cpp
+       pv/binding/binding.cpp
+       pv/binding/inputoutput.cpp
+       pv/binding/device.cpp
        pv/data/analog.cpp
        pv/data/analogsegment.cpp
        pv/data/logic.cpp
@@ -154,6 +157,7 @@ set(pulseview_SOURCES
        pv/data/segment.cpp
        pv/dialogs/about.cpp
        pv/dialogs/connect.cpp
+       pv/dialogs/inputoutputoptions.cpp
        pv/dialogs/storeprogress.cpp
        pv/popups/deviceoptions.cpp
        pv/popups/channels.cpp
@@ -163,8 +167,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,7 +192,9 @@ 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/importmenu.cpp
        pv/widgets/popup.cpp
        pv/widgets/popuptoolbutton.cpp
        pv/widgets/sweeptimingwidget.cpp
@@ -202,8 +206,10 @@ 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/inputoutputoptions.hpp
        pv/dialogs/storeprogress.hpp
        pv/popups/channels.hpp
        pv/popups/deviceoptions.hpp
@@ -213,7 +219,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
@@ -234,7 +239,9 @@ 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/importmenu.hpp
        pv/widgets/popup.hpp
        pv/widgets/popuptoolbutton.hpp
        pv/widgets/sweeptimingwidget.hpp
@@ -256,12 +263,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
@@ -291,7 +298,10 @@ if(Qt5Core_FOUND)
        qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
        qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
 else()
-       qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
+       # Workaroud for QTBUG-22829: -DBOOST_NEXT_PRIOR_HPP_INCLUDED.
+       # https://bugreports.qt.io/browse/QTBUG-22829
+       qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}
+               OPTIONS -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
        qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
        qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
        include(${QT_USE_FILE})