[Cmake-commits] CMake branch, master, updated. c94303fcac16026afcf07aea0400235f09f09f80

[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  c94303fcac16026afcf07aea0400235f09f09f80 (commit)
      from  e93b737dd52e5ca812b81fe33afd1c7b635752a0 (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=c94303fcac16026afcf07aea0400235f09f09f80
commit c94303fcac16026afcf07aea0400235f09f09f80
Author: Clinton Stimpson <clinton at elemtech.com>
Date:   Thu Apr 8 16:39:15 2010 -0600

    Revert "Include relative path in generated qrc and uic files.  Fixes #10413."
    
    This reverts commit 108090fde96916ba666f035d1e260f036af5b31e.

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index fc26c06..bd72c8f 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)
-    QT4_MAKE_OUTPUT_FILE(${infile} ui_ h outfile)
+    SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
     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)
-    QT4_MAKE_OUTPUT_FILE(${infile} qrc_ cxx outfile)
+    SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
     #  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