mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 06:40:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'fbuild_fix_pch' into release-4.2

Browse Source 
878d154322 FASTBuild: fix multi-language PCHs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11404
This commit is contained in:
Brad King
2025-11-15 13:58:31 +00:00
committed by Kitware Robot
parent 64a9839c25 878d154322
commit 9e38d74019
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmFastbuildNormalTargetGenerator.cxx
+5 -3
View File
@@ -1499,11 +1499,13 @@ void cmFastbuildNormalTargetGenerator::GenerateObjects(FastbuildTarget& target)
objects.reserve(nodesPermutations.size());
for (auto& val : nodesPermutations) {
auto& node = val.second;
objects.emplace_back(std::move(node));
if (!objects.back().PCHInputFile.empty()) {
if (!node.PCHInputFile.empty()) {
// Node that produces PCH should be the first one, since other nodes
// might reuse this PCH.
std::swap(*objects.begin(), objects.back());
// Note: we might have several such nodes for different languages.
objects.insert(objects.begin(), std::move(node));
} else {
objects.emplace_back(std::move(node));
}
}
if (useUnity) {