[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2559-gaf1b652

[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  af1b65250e80bdf976a048cb74439d866c7db043 (commit)
       via  b10a653568a9eeeb3e6ba0065556265dfa748139 (commit)
      from  7d13ac0aebd1903964e4f16a310e6cd42939fc78 (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=af1b65250e80bdf976a048cb74439d866c7db043
commit af1b65250e80bdf976a048cb74439d866c7db043
Merge: 7d13ac0 b10a653
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Apr 25 12:12:47 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 25 12:12:47 2014 -0400

    Merge topic 'dont-rewrite-moc-parameter-file' into next
    
    b10a6535 Revert "Qt4: write moc parameter file only when content has changed"


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

    Revert "Qt4: write moc parameter file only when content has changed"
    
    This reverts commit 60dda7ff7b197afba2e3ba146f1ae4f04567c7ef.

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index a5427fa..b1b12d6 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -135,17 +135,7 @@ function (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target
     set(targetincludes)
     set(targetdefines)
   else()
-    set(_write_moc TRUE)
-    set(_new_moc "${_moc_parameters}\n")
-    if(EXISTS ${_moc_parameters_file})
-      file(READ ${_moc_parameters_file} _old_moc)
-      if(${_new_moc} STREQUAL ${_old_moc})
-        set(_write_moc FALSE)
-      endif()
-    endif()
-    if(_write_moc)
-      file(WRITE ${_moc_parameters_file} "${_new_moc}\n")
-    endif()
+    file(WRITE ${_moc_parameters_file} "${_moc_parameters}\n")
   endif()
 
   set(_moc_extra_parameters_file @${_moc_parameters_file})

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

Summary of changes:
 Modules/Qt4Macros.cmake |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)


hooks/post-receive
-- 
CMake