[Cmake-commits] CMake branch, next, updated. v2.8.2-1080-gcde67a2

[Clinton Stimpson]

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, next has been updated
       via  cde67a278ce98e5639cd87223ad376a9cd74e724 (commit)
       via  de0485459c448fe7ef4b8955d34d8313449f9337 (commit)
       via  57c04db124f71f608522a8631feb4b9fcb67e81f (commit)
       via  3dc07529cfa5e494e282e139e02347dd5940c8dc (commit)
      from  a3a0bf48c99dcb748eac825011feb6bcea361620 (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=cde67a278ce98e5639cd87223ad376a9cd74e724
commit cde67a278ce98e5639cd87223ad376a9cd74e724
Merge: a3a0bf4 de04854
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Oct 15 16:46:59 2010 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Fri Oct 15 16:46:59 2010 -0600

    Merge branch 'qt4-resources-bug5952' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de0485459c448fe7ef4b8955d34d8313449f9337
commit de0485459c448fe7ef4b8955d34d8313449f9337
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Oct 15 16:46:39 2010 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Fri Oct 15 16:46:39 2010 -0600

    Force cmake to run again when qrc dependency scanning needs to happen.

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 700d3a2..df07d25 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -196,11 +196,16 @@ MACRO (QT4_ADD_RESOURCES outfiles )
       ENDIF(NOT IS_ABSOLUTE "${_RC_FILE}")
       SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
     ENDFOREACH(_RC_FILE)
+    # Since this cmake macro is doing the dependency scanning for these files,
+    # let's make a configured file and add it as a dependency so cmake is run
+    # again when dependencies need to be recomputed.
+    QT4_MAKE_OUTPUT_FILE("${infile}" "" "qrc.depends" out_depends)
+    CONFIGURE_FILE("${infile}" "${out_depends}" COPY_ONLY)
     ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
       COMMAND ${QT_RCC_EXECUTABLE}
       ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}
       MAIN_DEPENDENCY ${infile}
-      DEPENDS ${_RC_DEPENDS})
+      DEPENDS ${_RC_DEPENDS} "${out_depends}")
     SET(${outfiles} ${${outfiles}} ${outfile})
   ENDFOREACH (it)
 

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

Summary of changes:
 Modules/Qt4Macros.cmake           |    7 ++++++-
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake