[Cmake-commits] CMake branch, next, updated. v2.8.4-1142-gf288843

Clinton Stimpson clinton at elemtech.com
Thu Mar 10 16:46:28 EST 2011


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  f28884316b9808cae679bc04aa5b1c0084d39d50 (commit)
       via  ae587e49a681732c949540274ea9dc9bc58cf9f6 (commit)
      from  f8f5b7e01309068568288305cef2f66a10b8d319 (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=f28884316b9808cae679bc04aa5b1c0084d39d50
commit f28884316b9808cae679bc04aa5b1c0084d39d50
Merge: f8f5b7e ae587e4
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Mar 10 16:46:27 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 10 16:46:27 2011 -0500

    Merge topic 'qt4-paramfile-speed' into next
    
    ae587e4 Speed up creation of parameters file for moc custom command.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae587e49a681732c949540274ea9dc9bc58cf9f6
commit ae587e49a681732c949540274ea9dc9bc58cf9f6
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Mar 10 14:45:45 2011 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Mar 10 14:45:45 2011 -0700

    Speed up creation of parameters file for moc custom command.
    
    Thanks A. Saratow for patch.

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 86a7404..6d7a3ec 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -107,10 +107,8 @@ MACRO (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
     ENDIF(_moc_outfile_dir)
     SET (_moc_parameters_file ${outfile}_parameters)
     SET (_moc_parameters ${moc_flags} ${moc_options} -o "${outfile}" "${infile}")
-    FILE (REMOVE ${_moc_parameters_file})
-    FOREACH(arg ${_moc_parameters})
-      FILE (APPEND ${_moc_parameters_file} "${arg}\n")
-    ENDFOREACH(arg)
+    STRING (REPLACE ";" "\n" _moc_parameters "${_moc_parameters}")
+    FILE (WRITE ${_moc_parameters_file} "${_moc_parameters}")
     ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
                        COMMAND ${QT_MOC_EXECUTABLE} @${_moc_outfile_name}_parameters
                        DEPENDS ${infile}

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list