[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-780-g2fc8bee

[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  2fc8bee548c8d15d34ae9357523e0d5423026c03 (commit)
       via  a4bbdc5ecf4d2b66346e1006cee891acf95c8ad8 (commit)
      from  a174f7e14b464be73a4282f9d1ade942f1476b5c (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2fc8bee548c8d15d34ae9357523e0d5423026c03
commit 2fc8bee548c8d15d34ae9357523e0d5423026c03
Merge: a174f7e a4bbdc5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 19:18:38 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 19:18:38 2015 -0400

    Merge topic 'cmLocalGenerator-generator-target-storage' into next
    
    a4bbdc5e cmLocalGenerator: Remove cmGeneratorTargetsType from setter API.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4bbdc5ecf4d2b66346e1006cee891acf95c8ad8
commit a4bbdc5ecf4d2b66346e1006cee891acf95c8ad8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 16:32:43 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 01:18:27 2015 +0200

    cmLocalGenerator: Remove cmGeneratorTargetsType from setter API.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index aecae35..a55365f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1574,7 +1574,6 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
 void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
                                                cmLocalGenerator *lg)
 {
-  cmGeneratorTargetsType generatorTargets;
   cmMakefile* mf = lg->GetMakefile();
   if (targetTypes == AllTargets)
     {
@@ -1585,7 +1584,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
       cmTarget* t = &ti->second;
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
       this->GeneratorTargets[t] = gt;
-      generatorTargets[t] = gt;
+      lg->AddGeneratorTarget(t, gt);
       }
     }
 
@@ -1596,7 +1595,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
     cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
     this->GeneratorTargets[*j] = gt;
     }
-  lg->SetGeneratorTargets(generatorTargets);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 2bc0e4a..307c67f 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -118,10 +118,6 @@ public:
       return this->GeneratorTargets;
     }
 
-  void SetGeneratorTargets(const cmGeneratorTargetsType &targets)
-    {
-      this->GeneratorTargets = targets;
-    }
   void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
 
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;

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

Summary of changes:


hooks/post-receive
-- 
CMake