From 263a4229e545f1e4882dfad5acaf65de8cf093e9 Mon Sep 17 00:00:00 2001 From: Clinton Stimpson Date: Tue, 26 Aug 2008 11:50:15 -0400 Subject: [PATCH] ENH: Use COMPILE_DEFINTIONS instead of DEFINITIONS. --- Modules/FindQt4.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index c3e4b2518e..35fa01f1dd 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -1042,12 +1042,14 @@ IF (QT4_QMAKE_FOUND) GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES) FOREACH(_current ${_inc_DIRS}) - SET(${_moc_flags} ${${_moc_flags}} "-I" ${_current}) + SET(${_moc_flags} ${${_moc_flags}} "-I${_current}") ENDFOREACH(_current ${_inc_DIRS}) - GET_DIRECTORY_PROPERTY(_defines DEFINITIONS) - SEPARATE_ARGUMENTS(_defines) - SET(${_moc_flags} ${${_moc_flags}} ${_defines}) + GET_DIRECTORY_PROPERTY(_defines COMPILE_DEFINITIONS) + FOREACH(_current ${_defines}) + SET(${_moc_flags} ${${_moc_flags}} "-D${_current}") + ENDFOREACH(_current ${_defines}) + IF(Q_WS_WIN) SET(${_moc_flags} ${${_moc_flags}} -DWIN32) ENDIF(Q_WS_WIN)