[Cmake-commits] CMake branch, next, updated. v2.8.5-1630-g0e2c11d

[Alexander Neundorf]

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  0e2c11d41d57a4d69fbc93479a193b2995706d7f (commit)
       via  71c29d11b3d089dbc9fb403ceed7999419615810 (commit)
      from  273e2b117ec3852794598fd94ceba48d6eb3be89 (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=0e2c11d41d57a4d69fbc93479a193b2995706d7f
commit 0e2c11d41d57a4d69fbc93479a193b2995706d7f
Merge: 273e2b1 71c29d1
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Wed Aug 17 11:04:49 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 17 11:04:49 2011 -0400

    Merge topic 'AutomocForQt' into next
    
    71c29d1 Fix bootstrap test with automoc


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=71c29d11b3d089dbc9fb403ceed7999419615810
commit 71c29d11b3d089dbc9fb403ceed7999419615810
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Aug 17 17:08:50 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Aug 17 17:08:50 2011 +0200

    Fix bootstrap test with automoc
    
    Alex

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3016f5a..27acf98 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -958,6 +958,7 @@ bool cmGlobalGenerator::CheckTargets()
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::CreateAutomocTargets()
 {
+#ifdef CMAKE_BUILD_WITH_CMAKE
   for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
     {
     cmTargets& targets =
@@ -979,6 +980,7 @@ void cmGlobalGenerator::CreateAutomocTargets()
         }
       }
     }
+#endif
 }
 
 
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index c5eff1c..99b1844 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1573,14 +1573,13 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
       {
       return cmake::ExecuteEchoColor(args);
       }
-#endif
-
     else if (args[1] == "cmake_automoc")
       {
         cmQtAutomoc automoc;
         automoc.Run(args[2].c_str());
         return 0;
       }
+#endif
 
     // Tar files
     else if (args[1] == "tar" && args.size() > 3)

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

Summary of changes:
 Source/cmGlobalGenerator.cxx |    2 ++
 Source/cmake.cxx             |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake