Merge topic 'fix-LINK_LIBRARIES-population'

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

View File

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