[Cmake-commits] CMake branch, next, updated. v2.8.12-4868-g14e7472

[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, next has been updated
       via  14e747219e33d8ce8e4e344b62a21084ffcf20b9 (commit)
       via  2377210994eb7a829e68a41919a550d2025185c8 (commit)
      from  d1e4f972b67d314dbc75022b67e6e2fa72e2a130 (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=14e747219e33d8ce8e4e344b62a21084ffcf20b9
commit 14e747219e33d8ce8e4e344b62a21084ffcf20b9
Merge: d1e4f97 2377210
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 18:28:06 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 4 18:28:06 2013 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2377210994eb7a829e68a41919a550d2025185c8
commit 2377210994eb7a829e68a41919a550d2025185c8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 4 18:26:11 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 4 18:26:11 2013 -0500

    cmQtAutogen: Skip during bootstrap of CMake

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index ead3508..2ffd478 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1097,10 +1097,12 @@ void cmGlobalGenerator::Generate()
 
   this->FinalizeTargetCompileDefinitions();
 
+#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;
@@ -1134,11 +1136,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