X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=80e90e9b48601bcf74cc665a9aaeb30ab263d49e;hb=e45b13b536666034c9b6fe52a9321d749dae3c02;hp=99314d05e8213fc9bb1e95c92fa568836169b37c;hpb=0c9136370d062b08e47657e12f77518197d89339;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99314d0..80e90e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,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
@@ -207,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
@@ -294,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})