[Cmake-commits] CMake branch, next, updated. v3.7.2-2253-gda9be2c

[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  da9be2c4764f2557e4a7b44a11ce6cb8412a100e (commit)
       via  54963f7c1c30622a4d4ca7afb3bd3c2d44257754 (commit)
      from  fa8f3ada662e9cbf3f92e9b60989dd25d623b23a (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=da9be2c4764f2557e4a7b44a11ce6cb8412a100e
commit da9be2c4764f2557e4a7b44a11ce6cb8412a100e
Merge: fa8f3ad 54963f7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 13:28:15 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 13:28:15 2017 -0500

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54963f7c1c30622a4d4ca7afb3bd3c2d44257754
commit 54963f7c1c30622a4d4ca7afb3bd3c2d44257754
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:27:35 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:
 Modules/Qt4Macros.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake