[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2584-g8723298

[Peter Kuemmel]

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  8723298cd6c9874ead0462483b866c5988351263 (commit)
       via  6a5bd7f0dacd96b66c294919fa5859ca12224d5f (commit)
       via  041dfea55b689fc1e0376c6f68c2e65b38a0507d (commit)
      from  b4aa9984f257d28ad8020be348b5d7ba54327325 (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=8723298cd6c9874ead0462483b866c5988351263
commit 8723298cd6c9874ead0462483b866c5988351263
Merge: b4aa998 6a5bd7f
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Mon Apr 28 09:52:47 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 28 09:52:47 2014 -0400

    Merge topic 'dont-rewrite-moc-parameter-file' into next
    
    6a5bd7f0 Qt4: write moc parameter file only when content has changed
    041dfea5 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a5bd7f0dacd96b66c294919fa5859ca12224d5f
commit 6a5bd7f0dacd96b66c294919fa5859ca12224d5f
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Fri Apr 25 18:24:56 2014 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Fri Apr 25 18:24:56 2014 +0200

    Qt4: write moc parameter file only when content has changed

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index b1b12d6..8c4daac 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -135,7 +135,9 @@ function (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target
     set(targetincludes)
     set(targetdefines)
   else()
-    file(WRITE ${_moc_parameters_file} "${_moc_parameters}\n")
+    set(CMAKE_CONFIGURABLE_FILE_CONTENT "${_moc_parameters}")
+    configure_file("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in"
+                   "${_moc_parameters_file}" @ONLY)
   endif()
 
   set(_moc_extra_parameters_file @${_moc_parameters_file})

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

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


hooks/post-receive
-- 
CMake