[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1072-g2bfdbe8

[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  2bfdbe89457ecd8597bef79396457574f600358c (commit)
       via  c481fadc07e72193f16a4f1fb9d477db133f1120 (commit)
      from  b2a3672e54584f6c17448bfc5a2ac97db46e6dc3 (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=2bfdbe89457ecd8597bef79396457574f600358c
commit 2bfdbe89457ecd8597bef79396457574f600358c
Merge: b2a3672 c481fad
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 15 04:29:58 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Mar 15 04:29:58 2014 -0400

    Merge topic 'target-objects-refactor' into next
    
    c481fadc cmGeneratorTarget: Don't store ObjectSources for object libraries.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c481fadc07e72193f16a4f1fb9d477db133f1120
commit c481fadc07e72193f16a4f1fb9d477db133f1120
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Mar 14 11:02:47 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Mar 15 09:29:44 2014 +0100

    cmGeneratorTarget: Don't store ObjectSources for object libraries.
    
    Compute them on demand instead.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 8efd7bb..2a144c6 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -310,10 +310,6 @@ cmGeneratorTarget
 ::GetObjectSources(std::vector<cmSourceFile const*> &data) const
 {
   IMPLEMENT_VISIT(ObjectSources);
-  if (this->Target->GetType() == cmTarget::OBJECT_LIBRARY)
-    {
-    this->ObjectSources = data;
-    }
 }
 
 //----------------------------------------------------------------------------
@@ -577,9 +573,11 @@ cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs) const
     cmTarget* objLib = *ti;
     cmGeneratorTarget* ogt =
       this->GlobalGenerator->GetGeneratorTarget(objLib);
+    std::vector<cmSourceFile const*> objectSources;
+    ogt->GetObjectSources(objectSources);
     for(std::vector<cmSourceFile const*>::const_iterator
-          si = ogt->ObjectSources.begin();
-        si != ogt->ObjectSources.end(); ++si)
+          si = objectSources.begin();
+        si != objectSources.end(); ++si)
       {
       std::string obj = ogt->ObjectDirectory;
       obj += ogt->Objects[*si];
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 139e736..53e27c5 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -127,7 +127,6 @@ private:
 
   std::map<cmSourceFile const*, std::string> Objects;
   std::set<cmSourceFile const*> ExplicitObjectName;
-  mutable std::vector<cmSourceFile const*> ObjectSources;
   std::vector<cmTarget*> ObjectLibraries;
   mutable std::map<std::string, std::vector<std::string> > SystemIncludesCache;
 

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

Summary of changes:


hooks/post-receive
-- 
CMake