[Cmake-commits] CMake branch, next, updated. v3.6.1-1167-g3e16d88

[Brad King]

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  3e16d885e07a30f644ebc4cf2397bcc1ab0a635a (commit)
       via  955c2a630aae9b925b468e98e7c323384d943cb0 (commit)
      from  e10f5fc665ea07d533a9fcd3ee6f519a650491f0 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e16d885e07a30f644ebc4cf2397bcc1ab0a635a
commit 3e16d885e07a30f644ebc4cf2397bcc1ab0a635a
Merge: e10f5fc 955c2a6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 8 14:02:29 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 8 14:02:29 2016 -0400

    Merge topic 'ninja-full-path' into next
    
    955c2a63 Ninja: Use full path for all source files


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=955c2a630aae9b925b468e98e7c323384d943cb0
commit 955c2a630aae9b925b468e98e7c323384d943cb0
Author:     Chaoren Lin <chaorenl at google.com>
AuthorDate: Fri Aug 5 16:51:56 2016 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 8 13:55:29 2016 -0400

    Ninja: Use full path for all source files
    
    This is consistent with the behavior of the Makefile generators.
    Relative paths are difficult for an IDE to parse the output of a build
    error.

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 855a243..1466f8a 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -305,7 +305,7 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang)
   vars.RuleLauncher = "RULE_LAUNCH_COMPILE";
   vars.CMTarget = this->GetGeneratorTarget();
   vars.Language = lang.c_str();
-  vars.Source = "$in";
+  vars.Source = "$IN_ABS";
   vars.Object = "$out";
   vars.Defines = "$DEFINES";
   vars.Includes = "$INCLUDES";
@@ -529,8 +529,7 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
   cmSourceFile const* source, bool writeOrderDependsTargetForTarget)
 {
   std::string const language = source->GetLanguage();
-  std::string const sourceFileName =
-    language == "RC" ? source->GetFullPath() : this->GetSourceFilePath(source);
+  std::string const sourceFileName = this->GetSourceFilePath(source);
   std::string const objectDir =
     this->ConvertToNinjaPath(this->GeneratorTarget->GetSupportDirectory());
   std::string const objectFileName =
@@ -539,6 +538,8 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
     cmSystemTools::GetFilenamePath(objectFileName);
 
   cmNinjaVars vars;
+  vars["IN_ABS"] = this->GetLocalGenerator()->ConvertToOutputFormat(
+    source->GetFullPath(), cmOutputConverter::SHELL);
   vars["FLAGS"] = this->ComputeFlagsForObject(source, language);
   vars["DEFINES"] = this->ComputeDefines(source, language);
   vars["INCLUDES"] = this->GetIncludes(language);

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

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


hooks/post-receive
-- 
CMake