X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=cmake%2Fmodules%2FFindQt4.cmake;h=678cf4a5c2ca974da16084d6aa50c75d9feb26be;hp=dc4969b2f5ad26cd02db86ff302d57e081abf23c;hb=b2fe17d9e5973684c7c965c614309970d64c817b;hpb=a33e42aee121185f479667b2104a15fc2033762e diff --git a/cmake/modules/FindQt4.cmake b/cmake/modules/FindQt4.cmake index dc4969b2..678cf4a5 100644 --- a/cmake/modules/FindQt4.cmake +++ b/cmake/modules/FindQt4.cmake @@ -1078,13 +1078,13 @@ IF (QT4_QMAKE_FOUND) ) FIND_PROGRAM(QT_LUPDATE_EXECUTABLE - NAMES lupdate + NAMES lupdate-qt4 lupdate 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 ) @@ -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}) - GET_DIRECTORY_PROPERTY(_defines COMPILE_DEFINITIONS) + GET_DIRECTORY_PROPERTY(_defines DEFINITIONS) FOREACH(_current ${_defines}) SET(${_moc_DEFINES} ${${_moc_DEFINES}} -D${_current}) ENDFOREACH(_current ${_defines})