From c864c8f46683157adb940123163aa88eff4a7872 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Wed, 3 Jan 2007 17:00:36 -0500
Subject: 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
---
 Modules/FindQt4.cmake | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 83ed95f..005b714 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -775,17 +775,19 @@ IF (QT4_QMAKE_FOUND)
 
 
   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} ${abs_infile}
+        DEPENDS ${abs_infile})
 
-    ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-      COMMAND ${QT_MOC_EXECUTABLE}
-      ARGS ${moc_includes} -o ${outfile} ${infile}
-      DEPENDS ${infile})
+     SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # dont run automoc on this file
 
-    MACRO_ADD_FILE_DEPENDENCIES(${infile} ${outfile})
+     MACRO_ADD_FILE_DEPENDENCIES(${abs_infile} ${outfile})
   ENDMACRO (QT4_GENERATE_MOC)
 
 
-- 
cgit v0.12