diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-21 21:00:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-02-21 22:08:57 (GMT) |
| commit | 5b8e9e068fc634459cfaeed90e20072ebaa01710 (patch) | |
| tree | 258da2cad84196a13eadb1298619cd2fd975375c /Source/cmLocalGenerator.cxx | |
| parent | 1313c78a9caaa9f4ab1ed985b2132cf40f404e71 (diff) | |
| download | CMake-5b8e9e068fc634459cfaeed90e20072ebaa01710.zip CMake-5b8e9e068fc634459cfaeed90e20072ebaa01710.tar.gz CMake-5b8e9e068fc634459cfaeed90e20072ebaa01710.tar.bz2 | |
Restore support for TARGET_OBJECTS in link interfaces with unity builds
This was broken by commit df08c37a42 (cmGlobalGenerator: Add unity/pch
sources after computing compile features, 2024-02-02, v3.28.3~1^2~1^2),
and 3.28.2's commit 76b5383123 (cmGlobalGenerator: add unity sources
after computing target compile features, 2024-01-01, v3.28.2~17^2~1).
The problem is very similar to that fixed by commit 4e8f24e977 (PCH:
Clear link interface cache when adding PCH object to it, 2022-01-24,
v3.23.0-rc1~44^2~9). Generalize that fix.
Fixes: #25696
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 86c55f5..2c3595b 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2831,15 +2831,10 @@ void cmLocalGenerator::AddPchDependencies(cmGeneratorTarget* target) cm::nullopt, true); } else if (reuseTarget->GetType() == cmStateEnums::OBJECT_LIBRARY) { - // FIXME: This can propagate more than one level, unlike - // the rest of the object files in an object library. - // Find another way to do this. target->Target->AppendProperty( "INTERFACE_LINK_LIBRARIES", cmStrCat("$<$<CONFIG:", config, ">:$<LINK_ONLY:", pchSourceObj, ">>")); - // We updated the link interface, so ensure it is recomputed. - target->ClearLinkInterfaceCache(); } } } else { |