diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-26 14:28:02 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-26 14:28:02 (GMT) |
| commit | 1b21ac405f7c0fecff26abac05423adeb281c6c1 (patch) | |
| tree | 9508b478af457be4cf0664c08fde3d65eeae3a82 /Source/cmTargetLinkLibrariesCommand.cxx | |
| parent | 564cf169e6edfe54ee3b558cf86c2a15936430d3 (diff) | |
| parent | 239b0c6b0ed821fd012a2a980961b9a9d43793e5 (diff) | |
| download | CMake-1b21ac405f7c0fecff26abac05423adeb281c6c1.zip CMake-1b21ac405f7c0fecff26abac05423adeb281c6c1.tar.gz CMake-1b21ac405f7c0fecff26abac05423adeb281c6c1.tar.bz2 | |
Merge topic 'fix-tll-static-private'
239b0c6 Don't add invalid content to static lib INTERFACE_LINK_LIBRARIES.
Diffstat (limited to 'Source/cmTargetLinkLibrariesCommand.cxx')
| -rw-r--r-- | Source/cmTargetLinkLibrariesCommand.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx index 0707c62..9add198 100644 --- a/Source/cmTargetLinkLibrariesCommand.cxx +++ b/Source/cmTargetLinkLibrariesCommand.cxx @@ -395,10 +395,15 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const char* lib, { if (this->Target->GetType() == cmTarget::STATIC_LIBRARY) { + std::string configLib = this->Target + ->GetDebugGeneratorExpressions(lib, llt); + if (cmGeneratorExpression::IsValidTargetName(lib) + || cmGeneratorExpression::Find(lib) != std::string::npos) + { + configLib = "$<LINK_ONLY:" + configLib + ">"; + } this->Target->AppendProperty("INTERFACE_LINK_LIBRARIES", - ("$<LINK_ONLY:" + - this->Target->GetDebugGeneratorExpressions(lib, llt) + - ">").c_str()); + configLib.c_str()); } // Not a 'public' or 'interface' library. Do not add to interface // property. |