[Cmake-commits] CMake branch, next, updated. v2.8.12-4900-g8d75f6b

[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  8d75f6b5f6eb365136259f29a381017d0d960efb (commit)
       via  6cb947bdf8c6074cee4fba7910d04593593e7b1e (commit)
       via  c17d029cb135d860375c7b488e148c69bcc8bab5 (commit)
      from  df8bb5647814be4a5df1b0f22e0658ec62c5beb5 (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=8d75f6b5f6eb365136259f29a381017d0d960efb
commit 8d75f6b5f6eb365136259f29a381017d0d960efb
Merge: df8bb56 6cb947b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 5 09:36:15 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 5 09:36:15 2013 -0500

    Merge topic 'fix-autogen-definitions' into next
    
    6cb947b Revert "Extract FinalizeTargetCompileDefinitions from cmGeneratorTarget."
    c17d029 Revert "cmQtAutogen: Skip during bootstrap of CMake"

diff --cc Source/cmGlobalGenerator.h
index d9d5e61,d08ae2a..bd873ce
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@@ -414,12 -414,10 +414,11 @@@ private
    // Per-target generator information.
    cmGeneratorTargetsType GeneratorTargets;
    void CreateGeneratorTargets();
-   void FinalizeTargetCompileDefinitions();
    void ComputeGeneratorTargetObjects();
 -  void ClearGeneratorTargets();
    virtual void ComputeTargetObjects(cmGeneratorTarget* gt) const;
  
 +  void ClearGeneratorMembers();
 +
    // Cache directory content and target files to be built.
    struct DirectoryContent: public std::set<cmStdString>
    {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cb947bdf8c6074cee4fba7910d04593593e7b1e
commit 6cb947bdf8c6074cee4fba7910d04593593e7b1e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 5 15:31:54 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 5 15:31:54 2013 +0100

    Revert "Extract FinalizeTargetCompileDefinitions from cmGeneratorTarget."
    
    This reverts commit e8a45a373fa5f43d024059754734a0dff0f58a4e.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index ead3508..7d99abe 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1095,8 +1095,6 @@ void cmGlobalGenerator::Generate()
     return;
     }
 
-  this->FinalizeTargetCompileDefinitions();
-
   // Iterate through all targets and set up automoc for those which have
   // the AUTOMOC, AUTOUIC or AUTORCC property set
   AutogensType autogens;
@@ -1302,11 +1300,13 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens)
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalGenerator::FinalizeTargetCompileDefinitions()
+void cmGlobalGenerator::CreateGeneratorTargets()
 {
   // Construct per-target generator information.
   for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
     {
+    cmGeneratorTargetsType generatorTargets;
+
     cmMakefile *mf = this->LocalGenerators[i]->GetMakefile();
 
     const std::vector<cmValueWithOrigin> noconfig_compile_definitions =
@@ -1321,6 +1321,7 @@ void cmGlobalGenerator::FinalizeTargetCompileDefinitions()
       {
       cmTarget* t = &ti->second;
 
+      {
       for (std::vector<cmValueWithOrigin>::const_iterator it
                                       = noconfig_compile_definitions.begin();
           it != noconfig_compile_definitions.end(); ++it)
@@ -1337,24 +1338,7 @@ void cmGlobalGenerator::FinalizeTargetCompileDefinitions()
                           mf->GetProperty(defPropName.c_str()));
         }
       }
-    }
-}
-
-//----------------------------------------------------------------------------
-void cmGlobalGenerator::CreateGeneratorTargets()
-{
-  // Construct per-target generator information.
-  for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
-    {
-    cmGeneratorTargetsType generatorTargets;
-
-    cmMakefile *mf = this->LocalGenerators[i]->GetMakefile();
 
-    cmTargets& targets = mf->GetTargets();
-    for(cmTargets::iterator ti = targets.begin();
-        ti != targets.end(); ++ti)
-      {
-      cmTarget* t = &ti->second;
       cmGeneratorTarget* gt = new cmGeneratorTarget(t);
       this->GeneratorTargets[t] = gt;
       generatorTargets[t] = gt;
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 2e20a4d..d08ae2a 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -414,7 +414,6 @@ private:
   // Per-target generator information.
   cmGeneratorTargetsType GeneratorTargets;
   void CreateGeneratorTargets();
-  void FinalizeTargetCompileDefinitions();
   void ComputeGeneratorTargetObjects();
   void ClearGeneratorTargets();
   virtual void ComputeTargetObjects(cmGeneratorTarget* gt) const;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c17d029cb135d860375c7b488e148c69bcc8bab5
commit c17d029cb135d860375c7b488e148c69bcc8bab5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 5 15:31:51 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 5 15:31:51 2013 +0100

    Revert "cmQtAutogen: Skip during bootstrap of CMake"
    
    This reverts commit 2377210994eb7a829e68a41919a550d2025185c8.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 2ffd478..ead3508 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1097,12 +1097,10 @@ 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;
@@ -1136,13 +1134,11 @@ 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 |   28 ++++------------------------
 Source/cmGlobalGenerator.h   |    1 -
 2 files changed, 4 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
CMake