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 6da6fa0023c4aa0a93a6d073bd13c7f343684126 (commit)
via 3e97bcb1ef18c7b1e16f81733896764bfd8178aa (commit)
from b692db5561a0cbecfacfcc468b70b9798016ade7 (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=6da6fa0023c4aa0a93a6d073bd13c7f343684126
commit 6da6fa0023c4aa0a93a6d073bd13c7f343684126
Merge: b692db5 3e97bcb
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Dec 12 12:23:01 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Dec 12 12:23:01 2013 -0500
Merge topic 'Qt4-NO_DEBUG-define' into next
3e97bcb Use a config-specific moc parameters file, if needed.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e97bcb1ef18c7b1e16f81733896764bfd8178aa
commit 3e97bcb1ef18c7b1e16f81733896764bfd8178aa
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Dec 12 18:22:17 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Dec 12 18:22:17 2013 +0100
Use a config-specific moc parameters file, if needed.
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index b5f005f..fd9819f 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -120,6 +120,7 @@ macro (QT4_CREATE_MOC_COMMAND infile outfile moc_flags
moc_options moc_target)
string (REPLACE ";" "\n" _moc_parameters "${_moc_parameters}")
if(moc_target)
+ set (_moc_parameters_file
${_moc_parameters_file}$<$<BOOL:$<CONFIGURATION>>:_$<CONFIGURATION>>)
set(targetincludes "$<TARGET_PROPERTY:${moc_target},INCLUDE_DIRECTORIES>")
set(targetdefines "$<TARGET_PROPERTY:${moc_target},COMPILE_DEFINITIONS>")
-----------------------------------------------------------------------
Summary of changes:
Modules/Qt4Macros.cmake | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
