Use device::Devices to represent sigrok Devices

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6848be500153ac15381d6082391ab041fc92d825..029f24b78a38dec94f0df1ad5825bc818286909c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,6 +147,7 @@ set(pulseview_SOURCES
        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
@@ -154,8 +155,12 @@ set(pulseview_SOURCES
        pv/data/logicsegment.cpp
        pv/data/signaldata.cpp
        pv/data/segment.cpp
+       pv/devices/device.cpp
+       pv/devices/hardwaredevice.cpp
+       pv/devices/sessionfile.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
@@ -192,6 +197,7 @@ set(pulseview_SOURCES
        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
@@ -206,6 +212,7 @@ set(pulseview_HEADERS
        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
@@ -237,6 +244,7 @@ set(pulseview_HEADERS
        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
@@ -293,7 +301,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})