diff options
author | Brad King <brad.king@kitware.com> | 2022-02-15 20:48:22 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2022-02-15 22:17:49 (GMT) |
commit | 42590df9f9fe07ba2aa0bbc19069a6f8cf561cb1 (patch) | |
tree | 222410604fd692ff61491f3d9a0860ada9a3c166 | |
parent | e5a5f3b76fd89a8e98c981012714f94a1d984ad8 (diff) | |
download | CMake-42590df9f9fe07ba2aa0bbc19069a6f8cf561cb1.zip CMake-42590df9f9fe07ba2aa0bbc19069a6f8cf561cb1.tar.gz CMake-42590df9f9fe07ba2aa0bbc19069a6f8cf561cb1.tar.bz2 |
target_link_libraries: Remove likely-broken ancient compatibility check
Since commit daa6d2bc04 (ENH: updated handling of debug and optimized
target link libraries, 2006-11-29, v2.6.0~2471) the ancient
`<lib>_LINK_TYPE` compatibility lookup was done using the name of the
dependent target for which `target_link_libraries` is called, rather
than the name of the library dependency being considered. This code
probably does nothing. Remove it.
-rw-r--r-- | Source/cmTargetLinkLibrariesCommand.cxx | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx index e15c941..38b1601 100644 --- a/Source/cmTargetLinkLibrariesCommand.cxx +++ b/Source/cmTargetLinkLibrariesCommand.cxx @@ -271,25 +271,10 @@ bool cmTargetLinkLibrariesCommand(std::vector<std::string> const& args, if (!tll.HandleLibrary(currentProcessingState, args[i], llt)) { return false; } - } else { - // Lookup old-style cache entry if type is unspecified. So if you - // do a target_link_libraries(foo optimized bar) it will stay optimized - // and not use the lookup. As there may be the case where someone has - // specified that a library is both debug and optimized. (this check is - // only there for backwards compatibility when mixing projects built - // with old versions of CMake and new) llt = GENERAL_LibraryType; - std::string linkType = cmStrCat(args[0], "_LINK_TYPE"); - cmValue linkTypeString = mf.GetDefinition(linkType); - if (linkTypeString) { - if (*linkTypeString == "debug") { - llt = DEBUG_LibraryType; - } - if (*linkTypeString == "optimized") { - llt = OPTIMIZED_LibraryType; - } - } - if (!tll.HandleLibrary(currentProcessingState, args[i], llt)) { + } else { + if (!tll.HandleLibrary(currentProcessingState, args[i], + GENERAL_LibraryType)) { return false; } } |