diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-22 12:52:04 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-22 12:52:18 (GMT) |
| commit | 10cbb87fa3a5f81dc9dedd24580a64e062047887 (patch) | |
| tree | 2174240974c59ec758e0ff893967b487906d522a /Source | |
| parent | 56c39d88363b3a0518bde1569d18ef1bdbeb01e7 (diff) | |
| parent | 805706b36df2eb31f35c1142e50dac6621683cac (diff) | |
| download | CMake-10cbb87fa3a5f81dc9dedd24580a64e062047887.zip CMake-10cbb87fa3a5f81dc9dedd24580a64e062047887.tar.gz CMake-10cbb87fa3a5f81dc9dedd24580a64e062047887.tar.bz2 | |
Merge topic 'ninja-fortran-depfile-fix'
805706b3 Ninja: Fix Fortran `include` dependency on generated file
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !601
Diffstat (limited to 'Source')
| -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 e233f12..2b16e19 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -985,7 +985,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"] = |