[Cmake-commits] CMake branch, next, updated. v3.7.2-2255-ge0cee46

[Brad King]

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  e0cee4632ec08a8eb2f73b33b2a702b3add0fc33 (commit)
       via  1c2ac0b8baebcf2496d701ab316f8f5666b470be (commit)
      from  da9be2c4764f2557e4a7b44a11ce6cb8412a100e (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0cee4632ec08a8eb2f73b33b2a702b3add0fc33
commit e0cee4632ec08a8eb2f73b33b2a702b3add0fc33
Merge: da9be2c 1c2ac0b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 13:29:03 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 13:29:03 2017 -0500

    Merge topic 'qt4-lupdate-cmp0058' into next
    
    1c2ac0b8 Qt4: Only change timestamp on generated .pro files if content changes


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c2ac0b8baebcf2496d701ab316f8f5666b470be
commit 1c2ac0b8baebcf2496d701ab316f8f5666b470be
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Jan 17 07:57:09 2017 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 13:28:48 2017 -0500

    Qt4: Only change timestamp on generated .pro files if content changes
    
    In qt4_create_translation() use file(GENERATE ...) instead of
    file(WRITE ...).  This also removes a possible CMP0058 warning
    because file(GENERATE) tells the Ninja generator about the files
    it provides.
    
    Fixes: #16518

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 0279d1c..0478918 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -439,7 +439,7 @@ macro(QT4_CREATE_TRANSLATION _qm_files)
          get_filename_component(_abs_include "${_pro_include}" ABSOLUTE)
          string(APPEND _pro_includes " \\\n  \"${_abs_include}\"")
        endforeach()
-       file(WRITE ${_ts_pro} "SOURCES =${_pro_srcs}\nINCLUDEPATH =${_pro_includes}\n")
+       file(GENERATE OUTPUT ${_ts_pro} CONTENT "SOURCES =${_pro_srcs}\nINCLUDEPATH =${_pro_includes}\n")
      endif()
      add_custom_command(OUTPUT ${_ts_file}
         COMMAND Qt4::lupdate

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

Summary of changes:


hooks/post-receive
-- 
CMake