[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-288-g0428c72

[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  0428c729ec5203a1887bbb078940a4fc0ad20be0 (commit)
       via  ae6ee87520349c432aad6f1dfa987a1cc630eacd (commit)
      from  742fcc25999fa30d348dc6df35cd07ecbdcb6fe9 (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=0428c729ec5203a1887bbb078940a4fc0ad20be0
commit 0428c729ec5203a1887bbb078940a4fc0ad20be0
Merge: 742fcc2 ae6ee87
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 8 16:28:51 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 8 16:28:51 2016 -0400

    Merge topic 'extract-cmLinkLineComputer' into next
    
    ae6ee875 fixup! Makefiles: Port CreateLinkLibs to cmLinkLineComputer


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae6ee87520349c432aad6f1dfa987a1cc630eacd
commit ae6ee87520349c432aad6f1dfa987a1cc630eacd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 8 22:28:30 2016 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 8 22:28:30 2016 +0200

    fixup! Makefiles: Port CreateLinkLibs to cmLinkLineComputer

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index c45ff7e..5c31e3e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1226,7 +1226,7 @@ void cmLocalGenerator::GetTargetFlags(
         return;
       }
       this->AddLanguageFlags(flags, linkLanguage, buildType);
-      if (!pcli) {
+      if (pcli) {
         this->OutputLinkLibraries(pcli, linkLineComputer, linkLibs,
                                   frameworkPath, linkPath);
       }

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

Summary of changes:
 Source/cmLocalGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake