[Cmake-commits] CMake branch, next, updated. v2.8.10.1-965-ge31f24a

[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  e31f24a3d4ce1b46cb87faff128a295abca8901e (commit)
       via  d3b571854c82b120e5872da5bbe0a8ba67f8da45 (commit)
      from  246a7c9874e1569366d8cd905f11b3f10797fbce (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=e31f24a3d4ce1b46cb87faff128a295abca8901e
commit e31f24a3d4ce1b46cb87faff128a295abca8901e
Merge: 246a7c9 d3b5718
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 21 07:38:11 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 21 07:38:11 2012 -0500

    Merge topic 'revert-use-generator-target' into next
    
    d3b5718 Fix 'Split link information processing into two steps.' commit.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3b571854c82b120e5872da5bbe0a8ba67f8da45
commit d3b571854c82b120e5872da5bbe0a8ba67f8da45
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 21 13:33:39 2012 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 21 13:34:01 2012 +0100

    Fix 'Split link information processing into two steps.' commit.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f9fbf31..4f101b6 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4708,7 +4708,11 @@ void cmTarget::ComputeLinkImplementation(const char* config,
       {
       continue;
       }
+    if(li->second != cmTarget::GENERAL && li->second != linkType)
+      {
+      // The entry is meant for this configuration.
       impl.Libraries.push_back(item);
+      }
     }
 
   LinkLibraryVectorType const& oldllibs = this->GetOriginalLinkLibraries();

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

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


hooks/post-receive
-- 
CMake