[Cmake-commits] CMake branch, next, updated. v2.8.12-4904-gdb76e18

[Stephen Kelly]

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  db76e18efa3c52a502877b8963839eded4dfc81f (commit)
       via  a74918213d6307e037e4510806a22c029b83b33e (commit)
      from  9a6dc3717e504e781a0a6664207995a56095e363 (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=db76e18efa3c52a502877b8963839eded4dfc81f
commit db76e18efa3c52a502877b8963839eded4dfc81f
Merge: 9a6dc37 a749182
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 5 09:38:18 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 5 09:38:18 2013 -0500

    Merge topic 'fix-autogen-definitions' into next
    
    a749182 cmQtAutogen: Skip during bootstrap of CMake


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a74918213d6307e037e4510806a22c029b83b33e
commit a74918213d6307e037e4510806a22c029b83b33e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 18:26:11 2013 -0500
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 5 15:37:43 2013 +0100

    cmQtAutogen: Skip during bootstrap of CMake

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 7d99abe..85c467d 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1095,10 +1095,12 @@ void cmGlobalGenerator::Generate()
     return;
     }
 
+#ifdef CMAKE_BUILD_WITH_CMAKE
   // Iterate through all targets and set up automoc for those which have
   // the AUTOMOC, AUTOUIC or AUTORCC property set
   AutogensType autogens;
   this->CreateQtAutoGeneratorsTargets(autogens);
+#endif
 
   // For each existing cmLocalGenerator
   unsigned int i;
@@ -1132,11 +1134,13 @@ void cmGlobalGenerator::Generate()
   // Create per-target generator information.
   this->CreateGeneratorTargets();
 
+#ifdef CMAKE_BUILD_WITH_CMAKE
   for (AutogensType::iterator it = autogens.begin(); it != autogens.end();
        ++it)
     {
     it->first.SetupAutoGenerateTarget(it->second);
     }
+#endif
 
   // Trace the dependencies, after that no custom commands should be added
   // because their dependencies might not be handled correctly

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

Summary of changes:
 Source/cmGlobalGenerator.cxx |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake