diff options
| author | Brad King <brad.king@kitware.com> | 2018-12-12 13:32:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-12-12 13:32:17 (GMT) |
| commit | 6a6900f61666977948bffa1409d4633799de323c (patch) | |
| tree | a0e3ecc319274205b436e5423dfcda850532e5ef /Source | |
| parent | 71e74b4ae453473d597ce5a53e2e8e7641dc832a (diff) | |
| parent | bab24e782c1bf56ef7263e91e5cf78879699a036 (diff) | |
| download | CMake-6a6900f61666977948bffa1409d4633799de323c.zip CMake-6a6900f61666977948bffa1409d4633799de323c.tar.gz CMake-6a6900f61666977948bffa1409d4633799de323c.tar.bz2 | |
Merge topic 'object-library-link'
bab24e782c target_link_libraries: Propagate dependencies of object libraries
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2725
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmTargetLinkLibrariesCommand.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx index 66cc6ee..eebf7a0 100644 --- a/Source/cmTargetLinkLibrariesCommand.cxx +++ b/Source/cmTargetLinkLibrariesCommand.cxx @@ -451,7 +451,8 @@ bool cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib, // STATIC library.) if (this->CurrentProcessingState == ProcessingKeywordPrivateInterface || this->CurrentProcessingState == ProcessingPlainPrivateInterface) { - if (this->Target->GetType() == cmStateEnums::STATIC_LIBRARY) { + if (this->Target->GetType() == cmStateEnums::STATIC_LIBRARY || + this->Target->GetType() == cmStateEnums::OBJECT_LIBRARY) { std::string configLib = this->Target->GetDebugGeneratorExpressions(libRef, llt); if (cmGeneratorExpression::IsValidTargetName(libRef) || |