[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-403-g1e8f151

[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  1e8f1510a0e5c0ae12beca221a427b0a896fca1f (commit)
       via  7215227102926fa2148e6e09a6c0cfebd35af8b5 (commit)
      from  a67e081742ee32fecd773334e73bcc820e88db05 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e8f1510a0e5c0ae12beca221a427b0a896fca1f
commit 1e8f1510a0e5c0ae12beca221a427b0a896fca1f
Merge: a67e081 7215227
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 10:16:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 10:16:20 2015 -0400

    Merge topic 'use-generator-target' into next
    
    72152271 fixup! cmTarget: Move link type enum out.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7215227102926fa2148e6e09a6c0cfebd35af8b5
commit 7215227102926fa2148e6e09a6c0cfebd35af8b5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 16:15:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 16:15:50 2015 +0200

    fixup! cmTarget: Move link type enum out.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index d639f1d..0128c78 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -779,9 +779,10 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
   {
   const bool isNonImportedTarget = tgt && !tgt->IsImported();
 
-  const std::string libName = (isNonImportedTarget && llt != GENERAL_LibraryType)
-                                                        ? targetNameGenex(lib)
-                                                        : lib;
+  const std::string libName =
+      (isNonImportedTarget && llt != GENERAL_LibraryType)
+      ? targetNameGenex(lib)
+      : lib;
   this->AppendProperty("LINK_LIBRARIES",
                        this->GetDebugGeneratorExpressions(libName,
                                                           llt).c_str());

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

Summary of changes:
 Source/cmTarget.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake