浏览代码

Merge topic 'revert-vs-BuildInParallel'

abb1c12162 VS: Revert "Build custom commands concurrently when possible"

Acked-by: Kitware Robot <[email protected]>
Merge-request: !8297
Brad King 2 年之前
父节点
当前提交
e939b82d2e
共有 1 个文件被更改,包括 4 次插入7 次删除
  1. 4 7
      Source/cmVisualStudio10TargetGenerator.cxx

+ 4 - 7
Source/cmVisualStudio10TargetGenerator.cxx

@@ -1810,13 +1810,10 @@ void cmVisualStudio10TargetGenerator::WriteCustomRule(
       this->WriteCustomRuleCSharp(e0, c, name, script, additional_inputs.str(),
                                   outputs.str(), comment, ccg);
     } else {
-      this->WriteCustomRuleCpp(
-        *spe2, c, script, additional_inputs.str(), outputs.str(), comment, ccg,
-        symbolic,
-        (command.GetUsesTerminal() ||
-         (command.HasMainDependency() && source->GetIsGenerated()))
-          ? BuildInParallel::No
-          : BuildInParallel::Yes);
+      // FIXME(#18405): Enable BuildInParallel::Yes via an option or policy.
+      this->WriteCustomRuleCpp(*spe2, c, script, additional_inputs.str(),
+                               outputs.str(), comment, ccg, symbolic,
+                               BuildInParallel::No);
     }
   }
 }