[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1211-g85035aa

[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  85035aa4d927b30ee4de6dd03f228515f319e66e (commit)
       via  6f643fbe5009e858ca7d843a34d8b6033c7bdd2e (commit)
      from  df8e6d23e0e7a3ddc4a84835ece38a0d99ad2607 (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=85035aa4d927b30ee4de6dd03f228515f319e66e
commit 85035aa4d927b30ee4de6dd03f228515f319e66e
Merge: df8e6d2 6f643fb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 19 11:23:25 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 19 11:23:25 2014 -0400

    Merge topic 'target-sources-refactor' into next
    
    6f643fbe Process object libraries only once.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f643fbe5009e858ca7d843a34d8b6033c7bdd2e
commit 6f643fbe5009e858ca7d843a34d8b6033c7bdd2e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 19 16:20:03 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Mar 19 16:20:03 2014 +0100

    Process object libraries only once.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 323e3f7..31efb20 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -536,13 +536,17 @@ cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs) const
   std::vector<cmSourceFile const*> objectFiles;
   this->GetExternalObjects(objectFiles);
   std::vector<cmTarget*> objectLibraries;
+  std::set<cmTarget*> emitted;
   for(std::vector<cmSourceFile const*>::const_iterator
       it = objectFiles.begin(); it != objectFiles.end(); ++it)
     {
     std::string objLib = (*it)->GetObjectLibrary();
     if (cmTarget* tgt = this->Makefile->FindTargetToUse(objLib))
       {
-      objectLibraries.push_back(tgt);
+      if (emitted.insert(tgt).second)
+        {
+        objectLibraries.push_back(tgt);
+        }
       }
     }
 

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

Summary of changes:
 Source/cmGeneratorTarget.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake