summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-04-03 17:08:27 (GMT)
committerBrad King <brad.king@kitware.com>2014-04-03 17:08:27 (GMT)
commitc4b31a2c473547306caa63cf8a49d3238125210a (patch)
treee34e40e3d91ac8709071152dba4ee74ac152fffa
parent97243c22b29f453c6403f514f73e6b8dec127194 (diff)
parent7beba98652212c7a44f291b51dd03681e5193c49 (diff)
downloadCMake-c4b31a2c473547306caa63cf8a49d3238125210a.zip
CMake-c4b31a2c473547306caa63cf8a49d3238125210a.tar.gz
CMake-c4b31a2c473547306caa63cf8a49d3238125210a.tar.bz2
Merge branch 'Qt4Macros-moc-performance' into release
-rw-r--r--Modules/Qt4Macros.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 8baf896..5ada030 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -103,7 +103,7 @@ endmacro()
# helper macro to set up a moc rule
-macro (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target)
+function (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target)
# For Windows, create a parameters file to work around command line length limit
# Pass the parameters in a file. Set the working directory to
# be that containing the parameters file and reference it by
@@ -144,7 +144,7 @@ macro (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target)
DEPENDS ${infile}
${_moc_working_dir}
VERBATIM)
-endmacro ()
+endfunction ()
macro (QT4_GENERATE_MOC infile outfile )