[Cmake-commits] CMake branch, next, updated. v2.8.8-3482-g5446903

[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  5446903b239fd15d9c09f1443148c5da583dd96a (commit)
       via  1cdeef795a9765091027656e5b904059da8fc1b1 (commit)
      from  86403d9cf76e8216128901f5ebb9f848fb8db294 (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=5446903b239fd15d9c09f1443148c5da583dd96a
commit 5446903b239fd15d9c09f1443148c5da583dd96a
Merge: 86403d9 1cdeef7
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Mon Jul 16 11:12:23 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 16 11:12:23 2012 -0400

    Merge topic 'ninja-cldeps-check-rc-result' into next
    
    1cdeef7 Ninja: readd quotes to src file path before patching it


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1cdeef795a9765091027656e5b904059da8fc1b1
commit 1cdeef795a9765091027656e5b904059da8fc1b1
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Mon Jul 16 16:48:32 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Mon Jul 16 16:48:32 2012 +0200

    Ninja: readd quotes to src file path before patching it

diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index f04ff87..69df88d 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -254,7 +254,10 @@ int main() {
     // rc: /fo x.dir\x.rc.res  ->  cl: /out:x.dir\x.rc.res.dep.obj
     clrest = replace(clrest, "/fo", "/out:");
     clrest = replace(clrest, objfile, objfile + ".dep.obj ");
+
     // rc: src\x\x.rc  ->  cl: /Tc src\x\x.rc
+    if (srcfile.find(" ") != std::string::npos)
+      srcfile = "\"" + srcfile + "\"";
     clrest = replace(clrest, srcfile, "/Tc " + srcfile);
 
     cl = "\"" + cl + "\" /P /DRC_INVOKED ";

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

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


hooks/post-receive
-- 
CMake