[Cmake-commits] CMake branch, next, updated. v2.8.9-922-g44b6197

[Peter Kuemmel]

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  44b619785c175ddc768dfa3ecd8dae986491697c (commit)
       via  794d2f19691bcf24e763955d614492442d724aa0 (commit)
      from  4f5024356d010fbb47120f5706473d347e80eedb (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=44b619785c175ddc768dfa3ecd8dae986491697c
commit 44b619785c175ddc768dfa3ecd8dae986491697c
Merge: 4f50243 794d2f1
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Mon Oct 1 10:27:30 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 1 10:27:30 2012 -0400

    Merge topic 'ninja-LIBPATH' into next
    
    794d2f1 Ninja: link path isn't part of LINK_LIBRARIES any more


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=794d2f19691bcf24e763955d614492442d724aa0
commit 794d2f19691bcf24e763955d614492442d724aa0
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Mon Oct 1 16:04:39 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Mon Oct 1 16:05:05 2012 +0200

    Ninja: link path isn't part of LINK_LIBRARIES any more

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index b4573ef..6c54ced 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -168,7 +168,7 @@ cmNinjaNormalTargetGenerator
     std::string responseFlag;
     if (!useResponseFile) {
       vars.Objects = "$in";
-      vars.LinkLibraries = "$LINK_LIBRARIES";
+      vars.LinkLibraries = "$LINK_PATH $LINK_LIBRARIES";
     } else {
         std::string cmakeVarLang = "CMAKE_";
         cmakeVarLang += this->TargetLinkLanguage;

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

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


hooks/post-receive
-- 
CMake