[Cmake-commits] CMake branch, next, updated. v2.8.6-2211-g7972ed0

[Brad King]

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  7972ed07eebeeaa9222acc035b0f14042421a86e (commit)
       via  feaf3b028e96598cbef65fed660bb09ab40fbc16 (commit)
      from  945d5bdb2422d55893c6c20614f2bf7053b6db00 (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=7972ed07eebeeaa9222acc035b0f14042421a86e
commit 7972ed07eebeeaa9222acc035b0f14042421a86e
Merge: 945d5bd feaf3b0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 14 15:08:20 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 14 15:08:20 2011 -0500

    Merge topic 'transitive-shared-lib-depend' into next
    
    feaf3b0 Revert "Follow only shared dependencies of shared library dependencies"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=feaf3b028e96598cbef65fed660bb09ab40fbc16
commit feaf3b028e96598cbef65fed660bb09ab40fbc16
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 14 15:06:58 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 14 15:06:58 2011 -0500

    Revert "Follow only shared dependencies of shared library dependencies"
    
    This reverts commit d30227125e83fc53e90dee1e0213b20d3fcc735c.  It is
    okay to add the extra dependencies because the linker will probably want
    to know where they are since the original shared library may have been
    linked against them.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 0cc0fc8..802cfcf 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -419,12 +419,6 @@ void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep)
   int index = lei->second;
   LinkEntry& entry = this->EntryList[index];
 
-  // Skip dependencies known to not be shared libraries.
-  if(entry.Target && entry.Target->GetType() != cmTarget::SHARED_LIBRARY)
-    {
-    return;
-    }
-
   // This shared library dependency must follow the item that listed
   // it.
   this->EntryConstraintGraph[dep.DependerIndex].push_back(index);

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

Summary of changes:
 Source/cmComputeLinkDepends.cxx |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake