[cmake-commits] alex committed FindQt4.cmake 1.53 1.54

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv12291

Modified Files:
	FindQt4.cmake 
Log Message:
BUG: argument names in macros are not real variables, which can lead to problems, which we fixed for KDE in Trysil: http://websvn.kde.org/trunk/KDE/kdelibs/cmake/modules/FindQt4.cmake?rev=557470&r1=557241&r2=557470

Alex


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- FindQt4.cmake	3 Jan 2007 21:48:08 -0000	1.53
+++ FindQt4.cmake	3 Jan 2007 22:00:36 -0000	1.54
@@ -775,17 +775,19 @@
 
 
   MACRO (QT4_GENERATE_MOC infile outfile )
-    # get include dirs
-    QT4_GET_MOC_INC_DIRS(moc_includes)
+  # get include dirs
+     QT4_GET_MOC_INC_DIRS(moc_includes)
 
-    GET_FILENAME_COMPONENT(infile ${infile} ABSOLUTE)
+     GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
 
-    ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-      COMMAND ${QT_MOC_EXECUTABLE}
-      ARGS ${moc_includes} -o ${outfile} ${infile}
-      DEPENDS ${infile})
+     ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+        COMMAND ${QT_MOC_EXECUTABLE}
+        ARGS ${moc_includes} -o ${outfile} ${abs_infile}
+        DEPENDS ${abs_infile})
 
-    MACRO_ADD_FILE_DEPENDENCIES(${infile} ${outfile})
+     SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # dont run automoc on this file
+
+     MACRO_ADD_FILE_DEPENDENCIES(${abs_infile} ${outfile})
   ENDMACRO (QT4_GENERATE_MOC)