From 00f2298f0788404cf170ed6ab50b73ef890b4302 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Tue, 25 Aug 2015 22:55:11 +0200
Subject: Reduce uses of cmMakefile::GetGlobalGenerator.

Don't assume the cmMakefile has a global generator.
---
 Source/cmComputeLinkDepends.cxx     | 4 +++-
 Source/cmComputeLinkInformation.cxx | 2 +-
 Source/cmGeneratorTarget.cxx        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 59590fd..1e02ae4 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -12,6 +12,7 @@
 #include "cmComputeLinkDepends.h"
 
 #include "cmComputeComponentGraph.h"
+#include "cmLocalGenerator.h"
 #include "cmGlobalGenerator.h"
 #include "cmMakefile.h"
 #include "cmTarget.h"
@@ -177,7 +178,8 @@ cmComputeLinkDepends
   // Store context information.
   this->Target = target;
   this->Makefile = this->Target->Target->GetMakefile();
-  this->GlobalGenerator = this->Makefile->GetGlobalGenerator();
+  this->GlobalGenerator =
+      this->Target->GetLocalGenerator()->GetGlobalGenerator();
   this->CMakeInstance = this->GlobalGenerator->GetCMakeInstance();
 
   // The configuration being linked.
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 6ba0eed..6c3822f 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -769,7 +769,7 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
   std::string lib;
   if(tgt)
     {
-    gtgt = tgt->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(tgt);
+    gtgt = this->GlobalGenerator->GetGeneratorTarget(tgt);
 
     lib = gtgt->GetFullPath(this->Config, this->UseImportLibrary);
     this->AddLibraryRuntimeInfo(lib, tgt);
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index ffdb54f..25fc8a7 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1228,7 +1228,7 @@ public:
       : Preference(0), Target(target)
     {
     this->Makefile = this->Target->Makefile;
-    this->GG = this->Makefile->GetGlobalGenerator();
+    this->GG = this->Target->GetLocalGenerator()->GetGlobalGenerator();
     }
   void Consider(const char* lang)
     {
-- 
cgit v0.12