[Cmake-commits] CMake branch, next, updated. v2.8.12-4071-gff12e98

[Rolf Eike Beer]

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  ff12e98513b95ec10d253f59b130900ac41967c0 (commit)
       via  51305f52f016635bc391e69752ff269fc889a867 (commit)
      from  435453c6a06b66758b8ef599c84ff9a6d5ad1f8a (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=ff12e98513b95ec10d253f59b130900ac41967c0
commit ff12e98513b95ec10d253f59b130900ac41967c0
Merge: 435453c 51305f5
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Oct 16 14:10:17 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 16 14:10:17 2013 -0400

    Merge topic 'readable-lupdate.pro' into next
    
    51305f5 Qt4: make pro files generated for translations easier to read


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51305f52f016635bc391e69752ff269fc889a867
commit 51305f52f016635bc391e69752ff269fc889a867
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Oct 16 11:31:04 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Oct 16 20:08:33 2013 +0200

    Qt4: make pro files generated for translations easier to read
    
    -use one line for each input file and include directory
    -remove duplicate include directories

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index e56634d..b5f005f 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -432,15 +432,16 @@ macro(QT4_CREATE_TRANSLATION _qm_files)
        set(_ts_pro ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_ts_name}_lupdate.pro)
        set(_pro_srcs)
        foreach(_pro_src ${_my_sources})
-         set(_pro_srcs "${_pro_srcs} \"${_pro_src}\"")
+         set(_pro_srcs "${_pro_srcs} \\\n  \"${_pro_src}\"")
        endforeach()
        set(_pro_includes)
        get_directory_property(_inc_DIRS INCLUDE_DIRECTORIES)
+       list(REMOVE_DUPLICATES _inc_DIRS)
        foreach(_pro_include ${_inc_DIRS})
          get_filename_component(_abs_include "${_pro_include}" ABSOLUTE)
-         set(_pro_includes "${_pro_includes} \"${_abs_include}\"")
+         set(_pro_includes "${_pro_includes} \\\n  \"${_abs_include}\"")
        endforeach()
-       file(WRITE ${_ts_pro} "SOURCES = ${_pro_srcs}\nINCLUDEPATH = ${_pro_includes}\n")
+       file(WRITE ${_ts_pro} "SOURCES =${_pro_srcs}\nINCLUDEPATH =${_pro_includes}\n")
      endif()
      add_custom_command(OUTPUT ${_ts_file}
         COMMAND ${QT_LUPDATE_EXECUTABLE}

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

Summary of changes:
 Modules/Qt4Macros.cmake |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake