[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-548-g6f5459e

[Kitware Robot]

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  6f5459e67de1d0f0ed40dd2abef86a295b52cd7f (commit)
       via  805706b36df2eb31f35c1142e50dac6621683cac (commit)
      from  578970f39c22e255cfc8bc16f21ddb96988dbb30 (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=6f5459e67de1d0f0ed40dd2abef86a295b52cd7f
commit 6f5459e67de1d0f0ed40dd2abef86a295b52cd7f
Merge: 578970f 805706b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 21 19:27:56 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Mar 21 15:27:58 2017 -0400

    Stage topic 'ninja-fortran-depfile-fix'
    
    Topic-id: 23158
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/601


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=805706b36df2eb31f35c1142e50dac6621683cac
commit 805706b36df2eb31f35c1142e50dac6621683cac
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 21 15:16:03 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 21 15:19:01 2017 -0400

    Ninja: Fix Fortran `include` dependency on generated file
    
    Work around upstream ninja issue 1251 by converting include directories
    used by our Fortran dependency scanner to the same path format that we
    use in preprocessor `-I` flags and in the `build.ninja` manifest.
    
    Fixes: #16722

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index b1f26e4..2e2c53d 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -978,7 +978,9 @@ void cmNinjaTargetGenerator::WriteTargetDependInfo(std::string const& lang)
                                               lang, this->GetConfigName());
   for (std::vector<std::string>::iterator i = includes.begin();
        i != includes.end(); ++i) {
-    tdi_include_dirs.append(*i);
+    // Convert the include directories the same way we do for -I flags.
+    // See upstream ninja issue 1251.
+    tdi_include_dirs.append(this->ConvertToNinjaPath(*i));
   }
 
   Json::Value& tdi_linked_target_dirs = tdi["linked-target-dirs"] =

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

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


hooks/post-receive
-- 
CMake