diff options
| author | Brad King <brad.king@kitware.com> | 2023-03-08 13:56:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-03-08 13:56:28 (GMT) |
| commit | cea9dae92ab77e198762aad617182517a0e7702c (patch) | |
| tree | 6e99736ee43c23dfe446234d1fcc0a99e39d799a /Source | |
| parent | a7e697d5d2e31500364ab16a48670b1fbfb72f22 (diff) | |
| parent | abb1c121629b77ba868dc9c9904620504e6b74f2 (diff) | |
| download | CMake-cea9dae92ab77e198762aad617182517a0e7702c.zip CMake-cea9dae92ab77e198762aad617182517a0e7702c.tar.gz CMake-cea9dae92ab77e198762aad617182517a0e7702c.tar.bz2 | |
Merge topic 'revert-vs-BuildInParallel' into release-3.26
abb1c12162 VS: Revert "Build custom commands concurrently when possible"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8297
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index c88679c..52de6ff 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1806,13 +1806,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); } } } |