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 a7d96ad6024001e7ae5042210ae033cf4f6cb1e7 (commit)
via aa21ae696d55c46231cf0a429afe900ad6e3cc9f (commit)
via 99514c7e9cfb23c96ab234df349d6de38693332a (commit)
from 7cbc305dea72b5b5fe709880b12cbfea70f9a293 (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=a7d96ad6024001e7ae5042210ae033cf4f6cb1e7
commit a7d96ad6024001e7ae5042210ae033cf4f6cb1e7
Merge: 7cbc305 aa21ae6
Author: Peter Kuemmel <syntheti...@gmx.net>
AuthorDate: Sun Apr 13 05:23:41 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Apr 13 05:23:41 2014 -0400
Merge topic 'ninja-win-link-path' into next
aa21ae69 Ninja: replace \ in LINK_PATH for MinGW
99514c7e CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa21ae696d55c46231cf0a429afe900ad6e3cc9f
commit aa21ae696d55c46231cf0a429afe900ad6e3cc9f
Author: Peter Kümmel <syntheti...@gmx.net>
AuthorDate: Sun Apr 13 11:21:58 2014 +0200
Commit: Peter Kümmel <syntheti...@gmx.net>
CommitDate: Sun Apr 13 11:21:58 2014 +0200
Ninja: replace \ in LINK_PATH for MinGW
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx
b/Source/cmNinjaNormalTargetGenerator.cxx
index c865617..1d25ded 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& linkPath = vars["LINK_PATH"];
+ std::replace(linkPath.begin(), linkPath.end(), '\\', '/');
}
const std::vector<cmCustomCommand> *cmdLists[3] = {
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/cmNinjaNormalTargetGenerator.cxx | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
