From: Claire Mouton Date: Fri, 14 Dec 2012 10:01:47 +0000 (+0100) Subject: Bug #1871 Compilation issue due to Boost and Qt compatibility bug. X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=89c0a685676245627c1ab192ae4f8d29a3f45448;p=bbtk.git Bug #1871 Compilation issue due to Boost and Qt compatibility bug. --- diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt index d69660f..449e133 100644 --- a/kernel/src/CMakeLists.txt +++ b/kernel/src/CMakeLists.txt @@ -172,7 +172,7 @@ IF(BBTK_USE_QT) SET(QT4_HEADERS_TO_WRAP bbtkQtBlackBoxDialog.h ) - QT4_WRAP_CPP(MOC_SOURCES ${QT4_HEADERS_TO_WRAP}) + QT4_WRAP_CPP(MOC_SOURCES ${QT4_HEADERS_TO_WRAP} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) #--------------------------------------------------------------------------- # UI QT4_WRAP_UI(UI_SOURCES diff --git a/packages/qt/src/CMakeLists.txt b/packages/qt/src/CMakeLists.txt index 8f11021..2deab84 100644 --- a/packages/qt/src/CMakeLists.txt +++ b/packages/qt/src/CMakeLists.txt @@ -29,7 +29,7 @@ SET(QT4_HEADERS_TO_WRAP bbqtSlider.h ) -QT4_WRAP_CPP(MOC_SOURCES ${QT4_HEADERS_TO_WRAP}) +QT4_WRAP_CPP(MOC_SOURCES ${QT4_HEADERS_TO_WRAP} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) #--------------------------------------------------------------------------- # UI #QT4_WRAP_UI(UI_SOURCES