kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-LINK_LIBRARIES-population'

Browse Source 
d7f1520 Don't wrap all targets in LINK_LIBRARIES in a TARGET_NAME genex.
This commit is contained in:
Brad King 2013-01-23 15:11:28 -05:00 committed by CMake Topic Stage
commit 7a336d2e31
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmTarget.cxx
View File

@ -2279,8 +2279,9 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
cmTarget *tgt = this->Makefile->FindTargetToUse(lib); cmTarget *tgt = this->Makefile->FindTargetToUse(lib);
const bool isNonImportedTarget = tgt && !tgt->IsImported(); const bool isNonImportedTarget = tgt && !tgt->IsImported();
std::string libName = isNonImportedTarget ? targetNameGenex(lib) const std::string libName = (isNonImportedTarget && llt != GENERAL)
: std::string(lib); ? targetNameGenex(lib)
: std::string(lib);
this->AppendProperty("LINK_LIBRARIES", this->AppendProperty("LINK_LIBRARIES",
this->GetDebugGeneratorExpressions(libName, this->GetDebugGeneratorExpressions(libName,
llt).c_str()); llt).c_str());