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 e57c8937d42f4e4f37935ea8d9b84e488684560f (commit)
via 60dda7ff7b197afba2e3ba146f1ae4f04567c7ef (commit)
via 533d10e48c530fe10bc199fa00596c2c87d24bf8 (commit)
from e58f7118430e0acc2aae640c10207662e9fbdf26 (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=e57c8937d42f4e4f37935ea8d9b84e488684560f
commit e57c8937d42f4e4f37935ea8d9b84e488684560f
Merge: e58f711 60dda7f
Author: Peter Kuemmel <syntheti...@gmx.net>
AuthorDate: Thu Apr 24 05:21:22 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Apr 24 05:21:22 2014 -0400
Merge topic 'dont-rewrite-moc-parameter-file' into next
60dda7ff Qt4: write moc parameter file only when content has changed
533d10e4 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60dda7ff7b197afba2e3ba146f1ae4f04567c7ef
commit 60dda7ff7b197afba2e3ba146f1ae4f04567c7ef
Author: Peter Kümmel <syntheti...@gmx.net>
AuthorDate: Thu Apr 24 11:12:35 2014 +0200
Commit: Peter Kümmel <syntheti...@gmx.net>
CommitDate: Thu Apr 24 11:14:57 2014 +0200
Qt4: write moc parameter file only when content has changed
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index b1b12d6..a5427fa 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -135,7 +135,17 @@ 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(_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()
endif()
set(_moc_extra_parameters_file @${_moc_parameters_file})
-----------------------------------------------------------------------
Summary of changes:
Modules/Qt4Macros.cmake | 12 +++++++++++-
Source/CMakeVersion.cmake | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
