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
This commit is contained in:
Brad King
2023-03-08 13:56:20 +00:00
committed by Kitware Robot

View File

@@ -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);
}
}
}