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 bd132bd4e82c17a3bb34982be2deadcf8815cbfd (commit) via 381f89b748ca8e6e089a9d9866d68983736c614e (commit) from a7d96ad6024001e7ae5042210ae033cf4f6cb1e7 (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=bd132bd4e82c17a3bb34982be2deadcf8815cbfd commit bd132bd4e82c17a3bb34982be2deadcf8815cbfd Merge: a7d96ad 381f89b Author: Peter Kuemmel <syntheti...@gmx.net> AuthorDate: Sun Apr 13 08:41:04 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sun Apr 13 08:41:04 2014 -0400 Merge topic 'ninja-win-link-path' into next 381f89b7 Ninja: fix warning http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=381f89b748ca8e6e089a9d9866d68983736c614e commit 381f89b748ca8e6e089a9d9866d68983736c614e Author: Peter Kümmel <syntheti...@gmx.net> AuthorDate: Sun Apr 13 14:36:53 2014 +0200 Commit: Peter Kümmel <syntheti...@gmx.net> CommitDate: Sun Apr 13 14:40:18 2014 +0200 Ninja: fix warning diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 1d25ded..73e36b0 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -523,8 +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(), '\\', '/'); + std::string& link_path = vars["LINK_PATH"]; + std::replace(link_path.begin(), link_path.end(), '\\', '/'); } const std::vector<cmCustomCommand> *cmdLists[3] = { ----------------------------------------------------------------------- Summary of changes: Source/cmNinjaNormalTargetGenerator.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits