[Cmake-commits] CMake branch, next, updated. v2.8.8-3281-g3bf552e

[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  3bf552e8a7e0f36f082b27d2504e91e71b2d5a42 (commit)
       via  ca403b8c436e25e2fe5de5144fecf7aef8b5de78 (commit)
      from  cbaa57bc2e31a477023489537ce1c1b450f1c99d (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=3bf552e8a7e0f36f082b27d2504e91e71b2d5a42
commit 3bf552e8a7e0f36f082b27d2504e91e71b2d5a42
Merge: cbaa57b ca403b8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jun 21 02:12:21 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 21 02:12:21 2012 -0400

    Merge topic 'Ninja-absolute-compile-commands' into next
    
    ca403b8 Construct the full path before escaping it.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca403b8c436e25e2fe5de5144fecf7aef8b5de78
commit ca403b8c436e25e2fe5de5144fecf7aef8b5de78
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jun 20 22:47:41 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jun 20 22:47:41 2012 +0200

    Construct the full path before escaping it.
    
    Should fix some dashboard errors.

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 1063328..e130065 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -489,11 +489,10 @@ cmNinjaTargetGenerator
     cmLocalGenerator::RuleVariables compileObjectVars;
     std::string lang = language;
     compileObjectVars.Language = lang.c_str();
-    std::string escapedSourceFileName =
-      this->LocalGenerator->ConvertToOutputFormat(
-        sourceFileName.c_str(), cmLocalGenerator::SHELL);
 
-    if (!cmSystemTools::FileIsFullPath(escapedSourceFileName.c_str()))
+    std::string escapedSourceFileName = sourceFileName;
+
+    if (!cmSystemTools::FileIsFullPath(sourceFileName.c_str()))
       {
       escapedSourceFileName = cmSystemTools::CollapseFullPath(
         escapedSourceFileName.c_str(),
@@ -501,6 +500,10 @@ cmNinjaTargetGenerator
           GetHomeOutputDirectory());
       }
 
+    escapedSourceFileName =
+      this->LocalGenerator->ConvertToOutputFormat(
+        escapedSourceFileName.c_str(), cmLocalGenerator::SHELL);
+
     compileObjectVars.Source = escapedSourceFileName.c_str();
     compileObjectVars.Object = objectFileName.c_str();
     compileObjectVars.Flags = vars["FLAGS"].c_str();

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

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


hooks/post-receive
-- 
CMake