[Cmake-commits] CMake branch, master, updated. v3.0.0-rc3-495-g1dc59de

[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, master has been updated
       via  1dc59debcc52d86955c235b4d486bd4dfff24299 (commit)
       via  7beba98652212c7a44f291b51dd03681e5193c49 (commit)
      from  84487e91597c9a07e877251d09aa075133327088 (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=1dc59debcc52d86955c235b4d486bd4dfff24299
commit 1dc59debcc52d86955c235b4d486bd4dfff24299
Merge: 84487e9 7beba98
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 4 11:38:02 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 4 11:38:02 2014 -0400

    Merge topic 'Qt4Macros-moc-performance'
    
    7beba986 Qt4Macros: Make QT4_CREATE_MOC_COMMAND a function

diff --cc Modules/Qt4Macros.cmake
index aca8996,5ada030..23c4fc0
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@@ -141,10 -141,10 +141,10 @@@ function (QT4_CREATE_MOC_COMMAND infil
    set(_moc_extra_parameters_file @${_moc_parameters_file})
    add_custom_command(OUTPUT ${outfile}
                        COMMAND Qt4::moc ${_moc_extra_parameters_file}
 -                      DEPENDS ${infile}
 +                      DEPENDS ${infile} ${_moc_parameters_file}
                        ${_moc_working_dir}
                        VERBATIM)
- endmacro ()
+ endfunction ()
  
  
  macro (QT4_GENERATE_MOC infile outfile )

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

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


hooks/post-receive
-- 
CMake