Port to cmMakefile::GetGlobalGenerator.

1 files changed, 15 insertions, 17 deletions

diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index fac9641..aba00bd 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -62,8 +62,7 @@ bool cmInstallCommand::InitialPass(std::vector<std::string> const& args,
     }
 
   // Enable the install target.
-  this->Makefile->GetLocalGenerator()
-    ->GetGlobalGenerator()->EnableInstallTarget();
+  this->Makefile->GetGlobalGenerator()->EnableInstallTarget();
 
   this->DefaultComponentName = this->Makefile->GetSafeDefinition(
                                        "CMAKE_INSTALL_DEFAULT_COMPONENT_NAME");
@@ -198,7 +197,7 @@ bool cmInstallCommand::HandleScriptMode(std::vector<std::string> const& args)
     }
 
   //Tell the global generator about any installation component names specified.
-  this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
+  this->Makefile->GetGlobalGenerator()
                              ->AddInstallComponent(component.c_str());
 
   return true;
@@ -774,7 +773,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
       te->HeaderGenerator = publicHeaderGenerator;
       te->LibraryGenerator = libraryGenerator;
       te->RuntimeGenerator = runtimeGenerator;
-      this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
+      this->Makefile->GetGlobalGenerator()
         ->GetExportSets()[exports.GetString()]->AddTargetExport(te);
 
       te->InterfaceIncludeDirectories =
@@ -786,43 +785,42 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
   // specified
   if (installsArchive)
     {
-    this->Makefile->GetLocalGenerator()->
-      GetGlobalGenerator()
+    this->Makefile->GetGlobalGenerator()
       ->AddInstallComponent(archiveArgs.GetComponent().c_str());
     }
   if (installsLibrary)
     {
-    this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
+    this->Makefile->GetGlobalGenerator()
       ->AddInstallComponent(libraryArgs.GetComponent().c_str());
     }
   if (installsRuntime)
     {
-    this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
+    this->Makefile->GetGlobalGenerator()
       ->AddInstallComponent(runtimeArgs.GetComponent().c_str());
     }
   if (installsFramework)
     {
-    this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
+    this->Makefile->GetGlobalGenerator()
       ->AddInstallComponent(frameworkArgs.GetComponent().c_str());
     }
   if (installsBundle)
     {
-    this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
+    this->Makefile->GetGlobalGenerator()
       ->AddInstallComponent(bundleArgs.GetComponent().c_str());
     }
   if (installsPrivateHeader)
     {
-    this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
+    this->Makefile->GetGlobalGenerator()
       ->AddInstallComponent(privateHeaderArgs.GetComponent().c_str());
     }
   if (installsPublicHeader)
     {
-    this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
+    this->Makefile->GetGlobalGenerator()
       ->AddInstallComponent(publicHeaderArgs.GetComponent().c_str());
     }
   if (installsResource)
     {
-    this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
+    this->Makefile->GetGlobalGenerator()
       ->AddInstallComponent(resourceArgs.GetComponent().c_str());
     }
 
@@ -890,7 +888,7 @@ bool cmInstallCommand::HandleFilesMode(std::vector<std::string> const& args)
     CreateInstallFilesGenerator(this->Makefile, absFiles, ica, programs));
 
   //Tell the global generator about any installation component names specified.
-  this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
+  this->Makefile->GetGlobalGenerator()
                              ->AddInstallComponent(ica.GetComponent().c_str());
 
   return true;
@@ -1235,7 +1233,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
 
   // Tell the global generator about any installation component names
   // specified.
-  this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
+  this->Makefile->GetGlobalGenerator()
     ->AddInstallComponent(component.c_str());
 
   return true;
@@ -1322,8 +1320,8 @@ bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args)
       }
     }
 
-  cmExportSet *exportSet = this->Makefile->GetLocalGenerator()
-                    ->GetGlobalGenerator()->GetExportSets()[exp.GetString()];
+  cmExportSet *exportSet = this->Makefile->GetGlobalGenerator()
+                                         ->GetExportSets()[exp.GetString()];
   if (exportOld.IsEnabled())
     {
     for(std::vector<cmTargetExport*>::const_iterator