[Cmake-commits] CMake branch, next, updated. v2.8.8-2919-g8ee9ec4

[Stephen Kelly]

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  8ee9ec40bb9d5dab474dbd4daa1583333da55ffd (commit)
       via  f43066fe0cb7dcd0ce5e8304dd6d3895aeae5759 (commit)
      from  683f838337494cb13eafa5867ef46929efb1a5d5 (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=8ee9ec40bb9d5dab474dbd4daa1583333da55ffd
commit 8ee9ec40bb9d5dab474dbd4daa1583333da55ffd
Merge: 683f838 f43066f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 23 12:10:37 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 23 12:10:37 2012 -0400

    Merge topic 'Ninja-EXPORT_COMPILE_COMMANDS' into next
    
    f43066f Escape the source file to be compiled if required.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f43066fe0cb7dcd0ce5e8304dd6d3895aeae5759
commit f43066fe0cb7dcd0ce5e8304dd6d3895aeae5759
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 23 18:08:23 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 23 18:08:23 2012 +0200

    Escape the source file to be compiled if required.
    
    Whitespaces in paths can otherwise cause invalid command lines to
    be generated.

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 7c58154..e419a4d 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -492,7 +492,10 @@ cmNinjaTargetGenerator
     cmLocalGenerator::RuleVariables compileObjectVars;
     std::string lang = language;
     compileObjectVars.Language = lang.c_str();
-    compileObjectVars.Source = sourceFileName.c_str();
+    std::string escapedSourceFileName =
+      this->LocalGenerator->ConvertToOutputFormat(
+        sourceFileName.c_str(), cmLocalGenerator::SHELL);
+    compileObjectVars.Source = escapedSourceFileName.c_str();
     compileObjectVars.Object = objectFileName.c_str();
     compileObjectVars.Flags = vars["FLAGS"].c_str();
     compileObjectVars.Defines = vars["DEFINES"].c_str();

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

Summary of changes:
 Source/cmNinjaTargetGenerator.cxx |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake