[Cmake-commits] CMake branch, next, updated. v3.6.1-1052-g9587f55

[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  9587f55249c7f5c0f1dff25f0181f1e8427448a9 (commit)
       via  db8d5405a0bb2fe72d87aab7c984be3cd7386368 (commit)
      from  972a121a3cac7a461f40c531e9a107af677b2d42 (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=9587f55249c7f5c0f1dff25f0181f1e8427448a9
commit 9587f55249c7f5c0f1dff25f0181f1e8427448a9
Merge: 972a121 db8d540
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 2 13:29:54 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 2 13:29:54 2016 -0400

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db8d5405a0bb2fe72d87aab7c984be3cd7386368
commit db8d5405a0bb2fe72d87aab7c984be3cd7386368
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 2 13:29:26 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 2 13:29:36 2016 -0400

    Revert "Ninja: Use full path for all source files"
    
    This reverts commit d867f8a05a3fd748fbf360de2baf96f8136c5a27.
    It causes the Qt*Autogen tests to fail.

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 7849c5e..855a243 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -529,7 +529,8 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
   cmSourceFile const* source, bool writeOrderDependsTargetForTarget)
 {
   std::string const language = source->GetLanguage();
-  std::string const sourceFileName = source->GetFullPath();
+  std::string const sourceFileName =
+    language == "RC" ? source->GetFullPath() : this->GetSourceFilePath(source);
   std::string const objectDir =
     this->ConvertToNinjaPath(this->GeneratorTarget->GetSupportDirectory());
   std::string const objectFileName =

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

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


hooks/post-receive
-- 
CMake