X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=cmake%2Fmodules%2FFindQt4.cmake;h=1def7f44e35b85ea7bf48596f630a4a6ade906cd;hp=6c1dd86ccffb5e0a6931f20261be8b0b15b06f3e;hb=77a25f294ec11f00f5be890700a63c093d4f781b;hpb=e50164ea43269a479767eac4f9d035162646c36d diff --git a/cmake/modules/FindQt4.cmake b/cmake/modules/FindQt4.cmake index 6c1dd86c..1def7f44 100644 --- a/cmake/modules/FindQt4.cmake +++ b/cmake/modules/FindQt4.cmake @@ -1144,11 +1144,19 @@ IF (QT4_QMAKE_FOUND) # Added by Sput to provide definitions to moc calls MACRO (QT4_GET_MOC_DEFINES _moc_DEFINES) - SET(${_moc_DEFINES}) - GET_DIRECTORY_PROPERTY(_defines COMPILE_DEFINITIONS) - FOREACH(_current ${_defines}) + SET(${_moc_DEFINES}) + if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6) + GET_DIRECTORY_PROPERTY(_defines DEFINITIONS) + SEPARATE_ARGUMENTS(_defines) + FOREACH(_current ${_defines}) + SET(${_moc_DEFINES} ${${_moc_DEFINES}} ${_current}) + ENDFOREACH(_current ${_defines}) + else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6) + GET_DIRECTORY_PROPERTY(_defines COMPILE_DEFINITIONS) + FOREACH(_current ${_defines}) SET(${_moc_DEFINES} ${${_moc_DEFINES}} -D${_current}) - ENDFOREACH(_current ${_defines}) + ENDFOREACH(_current ${_defines}) + endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6) ENDMACRO(QT4_GET_MOC_DEFINES)