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 49b658e58e76c7f6f414880b5a74ead67668a3a3 (commit)
via 560a242817735905a40f85bf7a72577fbd3e6e32 (commit)
from 8ff4e153255c9cb5c51472edbed05cc512e676cb (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=49b658e58e76c7f6f414880b5a74ead67668a3a3
commit 49b658e58e76c7f6f414880b5a74ead67668a3a3
Merge: 8ff4e15 560a242
Author: Stephen Kelly <[email protected]>
AuthorDate: Mon Nov 25 15:52:57 2013 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Mon Nov 25 15:52:57 2013 -0500
Merge topic 'INTERFACE_AUTOUIC_OPTIONS' into next
560a242 The map key should be the config with no prefix.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=560a242817735905a40f85bf7a72577fbd3e6e32
commit 560a242817735905a40f85bf7a72577fbd3e6e32
Author: Stephen Kelly <[email protected]>
AuthorDate: Mon Nov 25 21:42:54 2013 +0100
Commit: Stephen Kelly <[email protected]>
CommitDate: Mon Nov 25 21:42:54 2013 +0100
The map key should be the config with no prefix.
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 12a39c5..38a2af8 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -521,7 +521,7 @@ void cmQtAutoGenerators::SetupAutoMocTarget(cmTarget*
target,
config_moc_compile_defs);
if (config_moc_incs != _moc_incs)
{
- configIncludes["_moc_incs_" + *li] =
+ configIncludes[*li] =
cmLocalGenerator::EscapeForCMake(config_moc_incs.c_str());
if(_moc_incs.empty())
{
@@ -530,7 +530,7 @@ void cmQtAutoGenerators::SetupAutoMocTarget(cmTarget*
target,
}
if (config_moc_compile_defs != _moc_compile_defs)
{
- configDefines["_moc_compile_defs_" + *li] =
+ configDefines[*li] =
cmLocalGenerator::EscapeForCMake(config_moc_compile_defs.c_str());
if(_moc_compile_defs.empty())
{
@@ -693,7 +693,7 @@ void cmQtAutoGenerators::SetupAutoUicTarget(cmTarget*
target,
GetUicOpts(target, li->c_str(), config_uic_opts);
if (config_uic_opts != _uic_opts)
{
- configUicOptions["_uic_target_options_" + *li] =
+ configUicOptions[*li] =
cmLocalGenerator::EscapeForCMake(config_uic_opts.c_str());
if(_uic_opts.empty())
{
-----------------------------------------------------------------------
Summary of changes:
Source/cmQtAutoGenerators.cxx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
