[Cmake-commits] CMake branch, next, updated. v2.8.8-3098-g996effa

[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  996effa12856b876a9f6a6183c58a3aa85639482 (commit)
       via  4db9dd89df2cc21747c65383b197efb9ca5cba4d (commit)
      from  ca82ed3df9a429ef32d843b28cbb35aa004f3880 (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=996effa12856b876a9f6a6183c58a3aa85639482
commit 996effa12856b876a9f6a6183c58a3aa85639482
Merge: ca82ed3 4db9dd8
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Jun 10 15:35:47 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 10 15:35:47 2012 -0400

    Merge topic 'ninja-cldeps' into next
    
    4db9dd8 Ninja: use slahes in .d files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4db9dd89df2cc21747c65383b197efb9ca5cba4d
commit 4db9dd89df2cc21747c65383b197efb9ca5cba4d
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Jun 10 21:27:25 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Sun Jun 10 21:27:25 2012 +0200

    Ninja: use slahes in .d files

diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index 9aa94d3..ac1c49a 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -576,7 +576,7 @@ static void outputDepFile(const string& dfile, const string& objfile,
 
   for (vector<string>::iterator i(incs.begin()); i != incs.end(); ++i) {
     tmp = *i;
-    doEscape(tmp, "\\", "\\\\");
+    doEscape(tmp, "\\", "/");
     doEscape(tmp, " ", "\\ ");
     //doEscape(tmp, "(", "("); // TODO ninja cant read ( and )
     //doEscape(tmp, ")", ")");

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

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


hooks/post-receive
-- 
CMake