From b22a464bcc91e813e2df573ea9c935354fa4b0f0 Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Thu, 11 May 2006 10:56:01 -0400
Subject: ENH: merge changs from main tree

---
 ChangeLog.manual      | 2 ++
 Modules/FindQt4.cmake | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.manual b/ChangeLog.manual
index 5558336..22d1bf3 100644
--- a/ChangeLog.manual
+++ b/ChangeLog.manual
@@ -1,5 +1,7 @@
 Changes in CMake 2.4.2
 
+* Fix FindQT to be able to use full paths to source files
+
 * Fix CPack ZIP on windows command line problem
 
 * Find executables with no extension on windows mingw
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index f9040b2..e5db44b 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -741,7 +741,7 @@ IF (QT4_QMAKE_FOUND)
 
     FOREACH (it ${ARGN})
       GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
-      SET(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it})
+      GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
       SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
       ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
         COMMAND ${QT_UIC_EXECUTABLE}
@@ -760,7 +760,7 @@ IF (QT4_QMAKE_FOUND)
 
     FOREACH (it ${ARGN})
       GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
-      SET(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it})
+      GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
       SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
       ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
         COMMAND ${QT_RCC_EXECUTABLE}
-- 
cgit v0.12