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
This commit is contained in:
Brad King
2017-03-22 12:52:04 +00:00
committed by Kitware Robot

View File

@@ -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"] =