[Cmake-commits] CMake branch, next, updated. v2.8.10.1-967-gdccdd10

[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  dccdd10ef43a3a40ef28bb400b73e4fb335563c3 (commit)
       via  a27c3f71a538b3d3a499b36f34ca14f22fcca7d9 (commit)
      from  e31f24a3d4ce1b46cb87faff128a295abca8901e (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=dccdd10ef43a3a40ef28bb400b73e4fb335563c3
commit dccdd10ef43a3a40ef28bb400b73e4fb335563c3
Merge: e31f24a a27c3f7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 21 07:45:12 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 21 07:45:12 2012 -0500

    Merge topic 'revert-use-generator-target' into next
    
    a27c3f7 Invert logic after bad copy/paste.


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

    Invert logic after bad copy/paste.

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

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

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


hooks/post-receive
-- 
CMake