summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-03-08 13:56:20 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-03-08 13:56:29 (GMT)
commite939b82d2eadc125c64a73a8916a6e7b06152e79 (patch)
tree77e4bfa9f80187ab2c0eee4537b3b660e83b378f
parent5cd2a0993dec7aeeacd2bfbcec9ce71b071a6e81 (diff)
parentabb1c121629b77ba868dc9c9904620504e6b74f2 (diff)
downloadCMake-e939b82d2eadc125c64a73a8916a6e7b06152e79.zip
CMake-e939b82d2eadc125c64a73a8916a6e7b06152e79.tar.gz
CMake-e939b82d2eadc125c64a73a8916a6e7b06152e79.tar.bz2
Merge topic 'revert-vs-BuildInParallel'
abb1c12162 VS: Revert "Build custom commands concurrently when possible" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8297
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index d984c86..d9d3fff 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/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);
}
}
}