projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix MOC defines for cmake-2.4. This fixes building without OpenSSL and cmake-2.4
[quassel.git]
/
cmake
/
modules
/
FindQt4.cmake
diff --git
a/cmake/modules/FindQt4.cmake
b/cmake/modules/FindQt4.cmake
index
dc4969b
..
678cf4a
100644
(file)
--- a/
cmake/modules/FindQt4.cmake
+++ b/
cmake/modules/FindQt4.cmake
@@
-1078,13
+1078,13
@@
IF (QT4_QMAKE_FOUND)
)
FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
)
FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
- NAMES lupdate
+ NAMES lupdate
-qt4 lupdate
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH
)
FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH
)
FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
- NAMES lrelease
+ NAMES lrelease
-qt4 lrelease
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH
)
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH
)
@@
-1145,7
+1145,7
@@
IF (QT4_QMAKE_FOUND)
# Added by Sput to provide definitions to moc calls
MACRO (QT4_GET_MOC_DEFINES _moc_DEFINES)
SET(${_moc_DEFINES})
# 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)
+ GET_DIRECTORY_PROPERTY(_defines DEFINITIONS)
FOREACH(_current ${_defines})
SET(${_moc_DEFINES} ${${_moc_DEFINES}} -D${_current})
ENDFOREACH(_current ${_defines})
FOREACH(_current ${_defines})
SET(${_moc_DEFINES} ${${_moc_DEFINES}} -D${_current})
ENDFOREACH(_current ${_defines})