X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=80e90e9b48601bcf74cc665a9aaeb30ab263d49e;hp=6848be500153ac15381d6082391ab041fc92d825;hb=72d85f366c78efac46c3332cfbfe11e73c5765a2;hpb=3cc9ad7b867853315473df611612c562d562ed8a diff --git a/CMakeLists.txt b/CMakeLists.txt index 6848be50..80e90e9b 100644 --- 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 @@ -156,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 @@ -206,6 +208,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 @@ -293,7 +296,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})