[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1667-gc9a242d

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c9a242d1b0fe87084f7f604199ad47e2564d285e (commit)
       via  d7f15209385e17580d911bcc10f78c921bd8c3fd (commit)
       via  5e572619c67c5ba38a68179111f7dea9648690ab (commit)
      from  215296dc6cebb702d588be03222337a4d4a79b7f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9a242d1b0fe87084f7f604199ad47e2564d285e
commit c9a242d1b0fe87084f7f604199ad47e2564d285e
Merge: 215296d d7f1520
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 20 05:30:33 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 20 05:30:33 2013 -0500

    Merge topic 'fix-LINK_LIBRARIES-population' into next
    
    d7f1520 Don't wrap all targets in LINK_LIBRARIES in a TARGET_NAME genex.
    5e57261 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7f15209385e17580d911bcc10f78c921bd8c3fd
commit d7f15209385e17580d911bcc10f78c921bd8c3fd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 20 11:25:35 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jan 20 11:25:35 2013 +0100

    Don't wrap all targets in LINK_LIBRARIES in a TARGET_NAME genex.
    
    It is not necessary and the current state is unintentional. Before
    this patch,
    
     target_link_libraries(foo bar)
    
    causes the LINK_LIBRARIES property of foo to contain
    
     $<TARGET_NAME:bar>
    
    instead of just
    
     bar

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 815da40..077eeec 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2269,8 +2269,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());

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 Source/cmTarget.cxx       |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake