[Cmake-commits] CMake branch, master, updated. 108090fde96916ba666f035d1e260f036af5b31e

[cmake-commits at cmake.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  108090fde96916ba666f035d1e260f036af5b31e (commit)
      from  61ad5242b7bf56ae9e9b6fc704d0228a9fa2d620 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=108090fde96916ba666f035d1e260f036af5b31e
commit 108090fde96916ba666f035d1e260f036af5b31e
Author: Clinton Stimpson <clinton at elemtech.com>
Date:   Wed Mar 17 16:33:03 2010 -0600

    Include relative path in generated qrc and uic files.  Fixes #10413.

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index bd72c8f..fc26c06 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -159,7 +159,7 @@ MACRO (QT4_WRAP_UI outfiles )
   FOREACH (it ${ui_files})
     GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
     GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
-    SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
+    QT4_MAKE_OUTPUT_FILE(${infile} ui_ h outfile)
     ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
       COMMAND ${QT_UIC_EXECUTABLE}
       ARGS ${ui_options} -o ${outfile} ${infile}
@@ -179,7 +179,7 @@ MACRO (QT4_ADD_RESOURCES outfiles )
     GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
     GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
     GET_FILENAME_COMPONENT(rc_path ${infile} PATH)
-    SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
+    QT4_MAKE_OUTPUT_FILE(${infile} qrc_ cxx outfile)
     #  parse file for dependencies 
     #  all files are absolute paths or relative to the location of the qrc file
     FILE(READ "${infile}" _RC_FILE_CONTENTS)

-----------------------------------------------------------------------

Summary of changes:
 Modules/Qt4Macros.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake