[Cmake-commits] CMake branch, next, updated. v3.0.0-4186-gf84890e

[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  f84890e5852aef9f3910faab1a7546156753d12e (commit)
       via  f45ede61a1e5282f432b169217028c80c12c77a3 (commit)
      from  41550f2d90eed9327fee873611a2e9f5094b5614 (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=f84890e5852aef9f3910faab1a7546156753d12e
commit f84890e5852aef9f3910faab1a7546156753d12e
Merge: 41550f2 f45ede6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 10 16:00:20 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 10 16:00:20 2014 -0400

    Merge topic 'refactor-link-internals' into next
    
    f45ede61 cmTarget: Fix CMP0022 OLD breakage from recent refactoring


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f45ede61a1e5282f432b169217028c80c12c77a3
commit f45ede61a1e5282f432b169217028c80c12c77a3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 10 15:50:15 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 10 16:01:04 2014 -0400

    cmTarget: Fix CMP0022 OLD breakage from recent refactoring
    
    In commit 7b0834e9 (cmTarget: Refactor internal LinkImplementation map,
    2014-06-19) cmTarget::GetLinkImplementationLibrariesInternal was changed
    accidentally to pass "this" to ComputeLinkImplementation instead of
    "head".  Change it back.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index aa0ed56..a6303e9 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6568,7 +6568,7 @@ cmTarget::GetLinkImplementationLibrariesInternal(const std::string& config,
   if(!impl.LibrariesDone)
     {
     impl.LibrariesDone = true;
-    this->ComputeLinkImplementation(config, impl, this);
+    this->ComputeLinkImplementation(config, impl, head);
     }
   return &impl;
 }

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

Summary of changes:
 Source/cmTarget.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake