summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-03-07 19:03:02 (GMT)
committerBrad King <brad.king@kitware.com>2023-03-07 19:19:49 (GMT)
commitabb1c121629b77ba868dc9c9904620504e6b74f2 (patch)
treedce81db21bb607c30664d22ba12f71ac0ca01010 /Source/cmVisualStudio10TargetGenerator.cxx
parent5f4dad37f03b36131e41306773a665486797733d (diff)
downloadCMake-abb1c121629b77ba868dc9c9904620504e6b74f2.zip
CMake-abb1c121629b77ba868dc9c9904620504e6b74f2.tar.gz
CMake-abb1c121629b77ba868dc9c9904620504e6b74f2.tar.bz2
VS: Revert "Build custom commands concurrently when possible"
Since commit 33c15ae2b9 (VS: Build custom commands concurrently when possible, 2023-01-19, v3.26.0-rc1~56^2) we add `BuildInParallel` to custom commands in `.vcxproj` files. However, this can break existing projects that implicitly rely on serial execution of custom commands. For example, custom commands in our FindCUDA module run MSVC (via nvcc) with a common `vc*.pdb` file, and therefore cannot run in parallel. Revert use of `BuildInParallel` while leaving most of the infrastructure for it in place. It can be restored later with an option or policy. Fixes: #24576 Issue: #18405
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx11
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);
}
}
}