[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1921-gc33add4

[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  c33add41e8deaf4ffb78cf14494b69a98036ce99 (commit)
       via  157046a022542eae751a7757f1aff15e1d756382 (commit)
      from  5b1a2500c4a818898e50029a99e74456d4b3159a (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=c33add41e8deaf4ffb78cf14494b69a98036ce99
commit c33add41e8deaf4ffb78cf14494b69a98036ce99
Merge: 5b1a250 157046a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 5 08:22:17 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Apr 5 08:22:17 2014 -0400

    Merge topic 'optimize-source-file-processing' into next
    
    157046a0 Fix tracing source file handling.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=157046a022542eae751a7757f1aff15e1d756382
commit 157046a022542eae751a7757f1aff15e1d756382
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 5 14:21:45 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Apr 5 14:21:45 2014 +0200

    Fix tracing source file handling.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 88952ef..0d25a00 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -636,26 +636,26 @@ cmTargetTraceDependencies
   // Queue all the source files already specified for the target.
   if (this->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
     {
-    std::vector<cmSourceFile*> sources;
     std::vector<std::string> configs;
     this->Makefile->GetConfigurations(configs);
     if (configs.empty())
       {
       configs.push_back("");
       }
+    std::set<cmSourceFile*> emitted;
     for(std::vector<std::string>::const_iterator ci = configs.begin();
         ci != configs.end(); ++ci)
       {
+      std::vector<cmSourceFile*> sources;
       this->Target->GetSourceFiles(sources, *ci);
-      }
-    std::set<cmSourceFile*> emitted;
-    for(std::vector<cmSourceFile*>::const_iterator si = sources.begin();
-        si != sources.end(); ++si)
-      {
-      cmSourceFile* sf = *si;
-      if(emitted.insert(sf).second && this->SourcesQueued.insert(sf).second)
+      for(std::vector<cmSourceFile*>::const_iterator si = sources.begin();
+          si != sources.end(); ++si)
         {
-        this->SourceQueue.push(sf);
+        cmSourceFile* sf = *si;
+        if(emitted.insert(sf).second && this->SourcesQueued.insert(sf).second)
+          {
+          this->SourceQueue.push(sf);
+          }
         }
       }
     }

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

Summary of changes:
 Source/cmGeneratorTarget.cxx |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake