[Cmake-commits] CMake branch, next, updated. v3.6.1-1050-g972a121

[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  972a121a3cac7a461f40c531e9a107af677b2d42 (commit)
       via  d867f8a05a3fd748fbf360de2baf96f8136c5a27 (commit)
      from  c6e3049340f37d3a8feb19afc184e335e41fa70e (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=972a121a3cac7a461f40c531e9a107af677b2d42
commit 972a121a3cac7a461f40c531e9a107af677b2d42
Merge: c6e3049 d867f8a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 2 11:51:06 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 2 11:51:06 2016 -0400

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d867f8a05a3fd748fbf360de2baf96f8136c5a27
commit d867f8a05a3fd748fbf360de2baf96f8136c5a27
Author:     Chaoren Lin <chaorenl at google.com>
AuthorDate: Fri Jul 29 14:44:52 2016 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 2 11:48:59 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..7849c5e 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -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 = source->GetFullPath();
   std::string const objectDir =
     this->ConvertToNinjaPath(this->GeneratorTarget->GetSupportDirectory());
   std::string const objectFileName =

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

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


hooks/post-receive
-- 
CMake