diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-21 15:16:03 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-03-21 15:19:01 -0400 |
| commit | 805706b36df2eb31f35c1142e50dac6621683cac (patch) | |
| tree | 938fc8bc1033f08ba6f93c23041cac0849afc703 /Source/cmNinjaTargetGenerator.cxx | |
| parent | e1adec32b8325fb731da084e99acd6070f5e39bf (diff) | |
| download | cmake-805706b36df2eb31f35c1142e50dac6621683cac.tar.gz | |
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
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index b1f26e480c..2e2c53d3ab 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"] = |