[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-290-g9ba2a76

[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  9ba2a76c8636156de00496f62a4d9d2be85b1b56 (commit)
       via  8d9daade39b9ebb190f32597469910a70a8131d0 (commit)
      from  0428c729ec5203a1887bbb078940a4fc0ad20be0 (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=9ba2a76c8636156de00496f62a4d9d2be85b1b56
commit 9ba2a76c8636156de00496f62a4d9d2be85b1b56
Merge: 0428c72 8d9daad
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 8 17:25:56 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 8 17:25:56 2016 -0400

    Merge topic 'extract-cmLinkLineComputer' into next
    
    8d9daade fixup! cmLinkLineComputer: Move ComputeLinkLibs from cmLocalGenerator


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

    fixup! cmLinkLineComputer: Move ComputeLinkLibs from cmLocalGenerator

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index acf06e4..7bafbb0 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -363,8 +363,8 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries(
     bool useWatcomQuote =
       this->Makefile->IsOn(createRule + "_USE_WATCOM_QUOTE");
     CM_AUTO_PTR<cmLinkLineComputer> linkLineComputer(
-      this->LocalGenerator,
       this->GetGlobalGenerator()->CreateLinkLineComputer(
+        this->LocalGenerator,
         this->LocalGenerator->GetStateSnapshot().GetDirectory()));
     linkLineComputer->SetUseWatcomQuote(useWatcomQuote);
 

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

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


hooks/post-receive
-- 
CMake