From 97dd5fd059a89bbf717adaf15e6f40674c01ab4b Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 27 May 2013 11:13:32 +0200 Subject: [PATCH] Pass argument to moc to fix problem with boost --- cMake/UseLibPack6x.cmake | 2 ++ cMake/UseLibPack7x.cmake | 2 ++ cMake/UseLibPack8x.cmake | 2 ++ cMake/UseLibPackCustom.cmake | 2 ++ 4 files changed, 8 insertions(+) diff --git a/cMake/UseLibPack6x.cmake b/cMake/UseLibPack6x.cmake index ef6bc2011..847ede524 100644 --- a/cMake/UseLibPack6x.cmake +++ b/cMake/UseLibPack6x.cmake @@ -196,6 +196,8 @@ include(AddFileDependencies) macro(fc_wrap_cpp outfiles ) QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN}) + # fixes bug 0000585: bug with boost 1.48 + SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) SET(ARGN) foreach(it ${moc_files}) get_filename_component(it ${it} ABSOLUTE) diff --git a/cMake/UseLibPack7x.cmake b/cMake/UseLibPack7x.cmake index 6063ef3b3..2e6ba13f6 100644 --- a/cMake/UseLibPack7x.cmake +++ b/cMake/UseLibPack7x.cmake @@ -207,6 +207,8 @@ include(AddFileDependencies) macro(fc_wrap_cpp outfiles ) QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN}) + # fixes bug 0000585: bug with boost 1.48 + SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) SET(ARGN) foreach(it ${moc_files}) get_filename_component(it ${it} ABSOLUTE) diff --git a/cMake/UseLibPack8x.cmake b/cMake/UseLibPack8x.cmake index 4def5d1f7..4b774a1d5 100644 --- a/cMake/UseLibPack8x.cmake +++ b/cMake/UseLibPack8x.cmake @@ -219,6 +219,8 @@ include(AddFileDependencies) macro(fc_wrap_cpp outfiles ) QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN}) + # fixes bug 0000585: bug with boost 1.48 + SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) SET(ARGN) foreach(it ${moc_files}) get_filename_component(it ${it} ABSOLUTE) diff --git a/cMake/UseLibPackCustom.cmake b/cMake/UseLibPackCustom.cmake index 740291a02..3747af21f 100644 --- a/cMake/UseLibPackCustom.cmake +++ b/cMake/UseLibPackCustom.cmake @@ -230,6 +230,8 @@ include(AddFileDependencies) macro(fc_wrap_cpp outfiles ) QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN}) + # fixes bug 0000585: bug with boost 1.48 + SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) SET(ARGN) foreach(it ${moc_files}) get_filename_component(it ${it} ABSOLUTE)