X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=cmake%2Fmodules%2FFindQt4.cmake;h=170e04b7beacc75a7a023ab651b060baae4751ef;hp=dc4969b2f5ad26cd02db86ff302d57e081abf23c;hb=392367381225027246e8c765a7c3b7e5bf186ee2;hpb=5be9872ecc1dd4eff6e220121b44eeb7208a1194

diff --git a/cmake/modules/FindQt4.cmake b/cmake/modules/FindQt4.cmake
index dc4969b2..170e04b7 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
     )
@@ -1142,20 +1142,10 @@ IF (QT4_QMAKE_FOUND)
 
   ENDMACRO(QT4_GET_MOC_INC_DIRS)
 
-  # 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} ${${_moc_DEFINES}} -D${_current})
-     ENDFOREACH(_current ${_defines})
-
-  ENDMACRO(QT4_GET_MOC_DEFINES)
-
   MACRO (QT4_GENERATE_MOC infile outfile )
   # get include dirs
      # QT4_GET_MOC_INC_DIRS(moc_includes) # Not needed...
-     QT4_GET_MOC_DEFINES(moc_defines)
+     # QT4_GET_MOC_DEFINES(moc_defines)   # Now supplied via ${MOC_DEFINES}
 
      GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
 
@@ -1171,7 +1161,7 @@ IF (QT4_QMAKE_FOUND)
      ELSE (MSVC_IDE)
         ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
            COMMAND ${QT_MOC_EXECUTABLE}
-           ARGS ${moc_includes} ${moc_defines} -o ${outfile} ${abs_infile}
+           ARGS ${moc_includes} ${MOC_DEFINES} -o ${outfile} ${abs_infile}
            DEPENDS ${abs_infile})
      ENDIF (MSVC_IDE)
 
@@ -1186,7 +1176,7 @@ IF (QT4_QMAKE_FOUND)
   MACRO (QT4_WRAP_CPP outfiles )
     # get include dirs
     # QT4_GET_MOC_INC_DIRS(moc_includes) # Not needed
-    QT4_GET_MOC_DEFINES(moc_defines)
+    # QT4_GET_MOC_DEFINES(moc_defines)   # Now supplied via ${MOC_DEFINES}
     QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
 
     FOREACH (it ${moc_files})
@@ -1196,7 +1186,7 @@ IF (QT4_QMAKE_FOUND)
       SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cxx)
       ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
         COMMAND ${QT_MOC_EXECUTABLE}
-        ARGS ${moc_includes} ${moc_defines} ${moc_options} -o ${outfile} ${it}
+        ARGS ${moc_includes} ${MOC_DEFINES} ${moc_options} -o ${outfile} ${it}
         DEPENDS ${it})
       SET(${outfiles} ${${outfiles}} ${outfile})
     ENDFOREACH(it)