diff options
| author | Brad King <brad.king@kitware.com> | 2013-01-23 20:11:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-01-23 20:11:28 (GMT) |
| commit | 7a336d2e31f508d2d7d13c607fc6295517e51f8c (patch) | |
| tree | 7e7d6604e104da577de960198e663bd0966a798e | |
| parent | a37b0e3ebfb7f607ff29c7c4946b2c003c7a7bf9 (diff) | |
| parent | d7f15209385e17580d911bcc10f78c921bd8c3fd (diff) | |
| download | CMake-7a336d2e31f508d2d7d13c607fc6295517e51f8c.zip CMake-7a336d2e31f508d2d7d13c607fc6295517e51f8c.tar.gz CMake-7a336d2e31f508d2d7d13c607fc6295517e51f8c.tar.bz2 | |
Merge topic 'fix-LINK_LIBRARIES-population'
d7f1520 Don't wrap all targets in LINK_LIBRARIES in a TARGET_NAME genex.
| -rw-r--r-- | Source/cmTarget.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 19e59d7..25660dc 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -2279,8 +2279,9 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf, cmTarget *tgt = this->Makefile->FindTargetToUse(lib); const bool isNonImportedTarget = tgt && !tgt->IsImported(); - std::string libName = isNonImportedTarget ? targetNameGenex(lib) - : std::string(lib); + const std::string libName = (isNonImportedTarget && llt != GENERAL) + ? targetNameGenex(lib) + : std::string(lib); this->AppendProperty("LINK_LIBRARIES", this->GetDebugGeneratorExpressions(libName, llt).c_str()); |