浏览代码

Merge topic 'ninja-fortran-depfile-fix'

805706b3 Ninja: Fix Fortran `include` dependency on generated file

Acked-by: Kitware Robot <[email protected]>
Merge-request: !601
Brad King 8 年之前
父节点
当前提交
10cbb87fa3
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      Source/cmNinjaTargetGenerator.cxx

+ 3 - 1
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"] =