diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-21 19:37:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-03-21 19:37:07 (GMT) |
| commit | 849f1ec1c07826973772599a55ad1736123b7708 (patch) | |
| tree | 141689f18975eadefbcc66eeb93e53515c0503fb /Source | |
| parent | 10eb329e31bf76a1abf2b9b0731a33dac8037970 (diff) | |
| parent | 805706b36df2eb31f35c1142e50dac6621683cac (diff) | |
| download | CMake-849f1ec1c07826973772599a55ad1736123b7708.zip CMake-849f1ec1c07826973772599a55ad1736123b7708.tar.gz CMake-849f1ec1c07826973772599a55ad1736123b7708.tar.bz2 | |
Merge branch 'ninja-fortran-depfile-fix' into release
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 c952026..d57b8f7 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -980,7 +980,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"] = |