diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2023-07-24 19:12:16 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2023-08-01 14:06:02 (GMT) |
| commit | 2c7acd34e2c3d7c314de278469349d5587910173 (patch) | |
| tree | 275ca46359ef23d081aee36692ff4c21f281cda1 /Source/cmComputeLinkInformation.cxx | |
| parent | e166bbef7bd8fa59c427911d96f41cd8a305af75 (diff) | |
| download | CMake-2c7acd34e2c3d7c314de278469349d5587910173.zip CMake-2c7acd34e2c3d7c314de278469349d5587910173.tar.gz CMake-2c7acd34e2c3d7c314de278469349d5587910173.tar.bz2 | |
cmComputeLinkInformation: add `OBJECT` libraries as link items
This completes the transition started in commit b665966933
(cmComputeLinkInformation: track OBJECT library dependencies,
2023-07-22).
Diffstat (limited to 'Source/cmComputeLinkInformation.cxx')
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index be73fa3..ccd20a0 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -536,12 +536,6 @@ cmComputeLinkInformation::GetSharedLibrariesLinked() const return this->SharedLibrariesLinked; } -const std::vector<const cmGeneratorTarget*>& -cmComputeLinkInformation::GetObjectLibrariesLinked() const -{ - return this->ObjectLibrariesLinked; -} - bool cmComputeLinkInformation::Compute() { // Skip targets that do not link. @@ -1164,12 +1158,7 @@ void cmComputeLinkInformation::AddItem(LinkEntry const& entry) this->AddItem(BT<std::string>(libName, item.Backtrace)); } } else if (tgt->GetType() == cmStateEnums::OBJECT_LIBRARY) { - if (!tgt->HaveCxx20ModuleSources() && !tgt->HaveFortranSources(config)) { - // Ignore object library! - // Its object-files should already have been extracted for linking. - } else { - this->ObjectLibrariesLinked.push_back(entry.Target); - } + this->Items.emplace_back(entry.Item, ItemIsPath::No, entry.Target); } else if (this->GlobalGenerator->IsXcode() && !tgt->GetImportedXcFrameworkPath(config).empty()) { this->Items.emplace_back( |