X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=80e90e9b48601bcf74cc665a9aaeb30ab263d49e;hp=79dd8f8b3118e424e8279cd9498f9089ba4230e9;hb=0661570b953f656b96762fc5ba81b9ee6b6fd83a;hpb=627ffe3f3a5d0a8f38e35668bd4ed71321f09b91 diff --git a/CMakeLists.txt b/CMakeLists.txt index 79dd8f8b..80e90e9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -296,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})