X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=80e90e9b48601bcf74cc665a9aaeb30ab263d49e;hp=c77859286a6204dbd212d0a5e5104eb40df1203d;hb=0661570b953f656b96762fc5ba81b9ee6b6fd83a;hpb=61703a0124c7ace84caf415f7d491a3ad6f42599

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7785928..80e90e9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,7 +147,8 @@ set(pulseview_SOURCES
 	pv/storesession.cpp
 	pv/util.cpp
 	pv/binding/binding.cpp
-	pv/binding/deviceoptions.cpp
+	pv/binding/inputoutput.cpp
+	pv/binding/device.cpp
 	pv/data/analog.cpp
 	pv/data/analogsegment.cpp
 	pv/data/logic.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
@@ -203,9 +205,10 @@ set(pulseview_HEADERS
 	pv/mainwindow.hpp
 	pv/session.hpp
 	pv/storesession.hpp
-	pv/binding/deviceoptions.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
@@ -258,7 +261,7 @@ endif()
 
 if(ENABLE_DECODE)
 	list(APPEND pulseview_SOURCES
-		pv/binding/decoderoptions.cpp
+		pv/binding/decoder.cpp
 		pv/data/decoderstack.cpp
 		pv/data/decode/annotation.cpp
 		pv/data/decode/decoder.cpp
@@ -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})