diff options
author | Brad King <brad.king@kitware.com> | 2023-10-31 13:12:20 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2023-10-31 13:12:28 (GMT) |
commit | 3a515b31b39d9eb9c07a39e6da7705cfd1d01f25 (patch) | |
tree | a3193b5adf1c74464afcb6d062c78b804e9e371e /Source/cmComputeLinkInformation.cxx | |
parent | d33ea3dff5e36e4e2dea39282f20512a8ec5c87f (diff) | |
parent | 22da18b9953f1ec9dff039572b5e8903009e4afb (diff) | |
download | CMake-3a515b31b39d9eb9c07a39e6da7705cfd1d01f25.zip CMake-3a515b31b39d9eb9c07a39e6da7705cfd1d01f25.tar.gz CMake-3a515b31b39d9eb9c07a39e6da7705cfd1d01f25.tar.bz2 |
Merge topic 'modules-depends-via-target-objects' into release-3.28
22da18b995 Fortran: Restore support for TARGET_OBJECTS providing modules
64d9240564 cmComputeLinkInformation: skip over linking to items for object purposes
035302b7e3 cmComputeLinkDepends: also copy the target from object link items
861876b936 Tests/ObjectLibrary: fix comment
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !8923
Diffstat (limited to 'Source/cmComputeLinkInformation.cxx')
-rw-r--r-- | Source/cmComputeLinkInformation.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 4cf3042..bd7ebed 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -1252,7 +1252,7 @@ void cmComputeLinkInformation::AddItem(LinkEntry const& entry) this->AddFullItem(entry); this->AddLibraryRuntimeInfo(item.Value); } - } else { + } else if (entry.Kind != cmComputeLinkDepends::LinkEntry::Object) { // This is a library or option specified by the user. this->AddUserItem(entry, true); } |