diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-01 15:50:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-01 15:50:33 (GMT) |
| commit | 87120b9c2a1aae4671b674ad3e06cd9666d91752 (patch) | |
| tree | 0a58305a37a2d036933c029d8bc960832611a9e2 /Source/cmTargetLinkLibrariesCommand.cxx | |
| parent | f4e2face6f867601f8a73754d627a81b26cdfd60 (diff) | |
| parent | 3d3713121b55320ce8031b838ba5ca5b844f2975 (diff) | |
| download | CMake-87120b9c2a1aae4671b674ad3e06cd9666d91752.zip CMake-87120b9c2a1aae4671b674ad3e06cd9666d91752.tar.gz CMake-87120b9c2a1aae4671b674ad3e06cd9666d91752.tar.bz2 | |
Merge topic 'out-of-dir-linking-private-deps'
3d3713121b target_link_libraries: Fix static library private deps in other dirs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3276
Diffstat (limited to 'Source/cmTargetLinkLibrariesCommand.cxx')
| -rw-r--r-- | Source/cmTargetLinkLibrariesCommand.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx index 5c7b95c..3883b52 100644 --- a/Source/cmTargetLinkLibrariesCommand.cxx +++ b/Source/cmTargetLinkLibrariesCommand.cxx @@ -456,8 +456,8 @@ bool cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib, this->Target->GetType() == cmStateEnums::OBJECT_LIBRARY) { std::string configLib = this->Target->GetDebugGeneratorExpressions(libRef, llt); - if (cmGeneratorExpression::IsValidTargetName(libRef) || - cmGeneratorExpression::Find(libRef) != std::string::npos) { + if (cmGeneratorExpression::IsValidTargetName(lib) || + cmGeneratorExpression::Find(lib) != std::string::npos) { configLib = "$<LINK_ONLY:" + configLib + ">"; } this->Target->AppendProperty("INTERFACE_LINK_LIBRARIES", |