[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1585-g2e09a86

[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  2e09a8635e84aa712650ee3b383bc3cc6c06cd88 (commit)
       via  4e85d29d1f8f0ee1c4907d750f3c9973d62890e1 (commit)
      from  c2938b77e249efae1f7aaa4ba949eef04a0544d5 (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=2e09a8635e84aa712650ee3b383bc3cc6c06cd88
commit 2e09a8635e84aa712650ee3b383bc3cc6c06cd88
Merge: c2938b7 4e85d29
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Mar 30 08:41:38 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Mar 30 08:41:38 2014 -0400

    Merge topic 'target-transitive-sources' into next
    
    4e85d29d Revert "cmGeneratorTarget: Don't add computed sources to the target."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e85d29d1f8f0ee1c4907d750f3c9973d62890e1
commit 4e85d29d1f8f0ee1c4907d750f3c9973d62890e1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Mar 30 14:41:17 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Mar 30 14:41:17 2014 +0200

    Revert "cmGeneratorTarget: Don't add computed sources to the target."
    
    This reverts commit 352536f2cdcf7218f1ab4090ee6688700e7f4381.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 8688f78..321dd42 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -619,11 +619,7 @@ cmTargetTraceDependencies
     for(std::vector<std::string>::const_iterator si = sources.begin();
         si != sources.end(); ++si)
       {
-      if(this->SourcesQueued.insert(*si).second)
-        {
-        this->SourceQueue.push(*si);
-        this->Makefile->GetOrCreateSource(*si);
-        }
+      this->QueueSource(*si);
       }
     }
 

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

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


hooks/post-receive
-- 
CMake