[Cmake-commits] CMake branch, next, updated. v2.8.12-4908-g50e1986

[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  50e198662393993223a08e12599e344c67743788 (commit)
       via  c971939a60dc6d553ed3df88945bbac20ae7b574 (commit)
      from  19f944fe4d5b41d409654e30e9c03c5043bda9db (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=50e198662393993223a08e12599e344c67743788
commit 50e198662393993223a08e12599e344c67743788
Merge: 19f944f c971939
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 5 09:39:38 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 5 09:39:38 2013 -0500

    Merge topic 'fix-autogen-definitions' into next
    
    c971939 Extract FinalizeTargetCompileDefinitions from cmGeneratorTarget.

diff --cc Source/cmGlobalGenerator.h
index bd873ce,2e20a4d..d9d5e61
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@@ -414,11 -414,11 +414,12 @@@ 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=c971939a60dc6d553ed3df88945bbac20ae7b574
commit c971939a60dc6d553ed3df88945bbac20ae7b574
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 4 10:51:37 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 5 15:39:12 2013 +0100

    Extract FinalizeTargetCompileDefinitions from cmGeneratorTarget.
    
    Call the method early in the generate step.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 85c467d..2ffd478 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1095,6 +1095,8 @@ void cmGlobalGenerator::Generate()
     return;
     }
 
+  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
@@ -1304,13 +1306,11 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens)
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalGenerator::CreateGeneratorTargets()
+void cmGlobalGenerator::FinalizeTargetCompileDefinitions()
 {
   // 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 =
@@ -1325,7 +1325,6 @@ void cmGlobalGenerator::CreateGeneratorTargets()
       {
       cmTarget* t = &ti->second;
 
-      {
       for (std::vector<cmValueWithOrigin>::const_iterator it
                                       = noconfig_compile_definitions.begin();
           it != noconfig_compile_definitions.end(); ++it)
@@ -1342,7 +1341,24 @@ void cmGlobalGenerator::CreateGeneratorTargets()
                           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 d08ae2a..2e20a4d 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -414,6 +414,7 @@ private:
   // Per-target generator information.
   cmGeneratorTargetsType GeneratorTargets;
   void CreateGeneratorTargets();
+  void FinalizeTargetCompileDefinitions();
   void ComputeGeneratorTargetObjects();
   void ClearGeneratorTargets();
   virtual void ComputeTargetObjects(cmGeneratorTarget* gt) const;

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

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


hooks/post-receive
-- 
CMake