[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2325-ga437dca

[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  a437dca14388cdc0dcbdcb934b86d9b3f2cdae7f (commit)
       via  504bb62d9918e7cc57746f26d96ba705c7d701ca (commit)
      from  be7af123961b6f25258936b879cfeb713c3a475c (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=a437dca14388cdc0dcbdcb934b86d9b3f2cdae7f
commit a437dca14388cdc0dcbdcb934b86d9b3f2cdae7f
Merge: be7af12 504bb62
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 15 10:14:36 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 15 10:14:36 2014 -0400

    Merge topic 'ninja-win-link-path' into next
    
    504bb62d Ninja: replace \ in LINK_PATH for MinGW


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=504bb62d9918e7cc57746f26d96ba705c7d701ca
commit 504bb62d9918e7cc57746f26d96ba705c7d701ca
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Sun Apr 13 11:21:58 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 15 10:14:50 2014 -0400

    Ninja: replace \ in LINK_PATH for MinGW

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index c865617..73e36b0 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -523,6 +523,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     // ar.exe can't handle backslashes in rsp files (implicitly used by gcc)
     std::string& linkLibraries = vars["LINK_LIBRARIES"];
     std::replace(linkLibraries.begin(), linkLibraries.end(), '\\', '/');
+    std::string& link_path = vars["LINK_PATH"];
+    std::replace(link_path.begin(), link_path.end(), '\\', '/');
     }
 
   const std::vector<cmCustomCommand> *cmdLists[3] = {

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

Summary of changes:


hooks/post-receive
-- 
CMake