cmGlobalGenerator: Remove MakeLocalGenerator method.

Inline implementation to callers.

Source/CPack/cmCPackGenerator.cxx

@@ -717,7 +717,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
         cm.SetProgressCallback(cmCPackGeneratorProgress, this);
         cmGlobalGenerator gg(&cm);
         cmsys::auto_ptr<cmLocalGenerator> lg(
-              gg.MakeLocalGenerator(cm.GetCurrentSnapshot()));
+              gg.CreateLocalGenerator(cm.GetCurrentSnapshot()));
         cmMakefile *mf = lg->GetMakefile();
         std::string realInstallDirectory = tempInstallDirectory;
         if ( !installSubDirectory.empty() && installSubDirectory != "/" )

Source/CPack/cpack.cxx

@@ -203,7 +203,7 @@ int main (int argc, char const* const* argv)
   cminst.GetState()->RemoveUnscriptableCommands();
   cmGlobalGenerator cmgg(&cminst);
   cmsys::auto_ptr<cmLocalGenerator> cmlg(
-        cmgg.MakeLocalGenerator(cminst.GetCurrentSnapshot()));
+        cmgg.CreateLocalGenerator(cminst.GetCurrentSnapshot()));
   cmMakefile* globalMF = cmlg->GetMakefile();
 #if defined(__CYGWIN__)
   globalMF->AddDefinition("CMAKE_LEGACY_CYGWIN_WIN32", "0");

Source/CTest/cmCTestLaunch.cxx

@@ -739,7 +739,7 @@ void cmCTestLaunch::LoadConfig()
   cm.SetHomeOutputDirectory("");
   cmGlobalGenerator gg(&cm);
   cmsys::auto_ptr<cmLocalGenerator> lg(
-        gg.MakeLocalGenerator(cm.GetCurrentSnapshot()));
+        gg.CreateLocalGenerator(cm.GetCurrentSnapshot()));
   cmMakefile* mf = lg->GetMakefile();
   std::string fname = this->LogDir;
   fname += "CTestLaunchConfig.cmake";

Source/CTest/cmCTestScriptHandler.cxx

@@ -342,7 +342,7 @@ void cmCTestScriptHandler::CreateCMake()
   this->GlobalGenerator = new cmGlobalGenerator(this->CMake);
 
   cmState::Snapshot snapshot = this->CMake->GetCurrentSnapshot();
-  this->LocalGenerator = this->GlobalGenerator->MakeLocalGenerator(snapshot);
+  this->LocalGenerator = this->GlobalGenerator->CreateLocalGenerator(snapshot);
   this->Makefile = this->LocalGenerator->GetMakefile();
 
   this->CMake->SetProgressCallback(ctestScriptProgressCallback, this->CTest);

Source/CTest/cmCTestTestHandler.cxx

@@ -1593,7 +1593,7 @@ void cmCTestTestHandler::GetListOfTests()
   cm.SetHomeOutputDirectory("");
   cmGlobalGenerator gg(&cm);
   cmsys::auto_ptr<cmLocalGenerator> lg(
-        gg.MakeLocalGenerator(cm.GetCurrentSnapshot()));
+        gg.CreateLocalGenerator(cm.GetCurrentSnapshot()));
   cmMakefile *mf = lg->GetMakefile();
   mf->AddDefinition("CTEST_CONFIGURATION_TYPE",
     this->CTest->GetConfigType().c_str());

Source/cmCTest.cxx

@@ -521,7 +521,7 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command)
   cm.SetHomeOutputDirectory("");
   cmGlobalGenerator gg(&cm);
   cmsys::auto_ptr<cmLocalGenerator> lg(
-        gg.MakeLocalGenerator(cm.GetCurrentSnapshot()));
+        gg.CreateLocalGenerator(cm.GetCurrentSnapshot()));
   cmMakefile *mf = lg->GetMakefile();
   if ( !this->ReadCustomConfigurationFileTree(this->BinaryDir.c_str(), mf) )
     {

Source/cmGlobalGenerator.cxx

@@ -1128,7 +1128,7 @@ void cmGlobalGenerator::Configure()
   this->ClearGeneratorMembers();
 
   // start with this directory
-  cmLocalGenerator *lg = this->MakeLocalGenerator(
+  cmLocalGenerator *lg = this->CreateLocalGenerator(
         this->GetCMakeInstance()->GetCurrentSnapshot());
   this->Makefiles.push_back(lg->GetMakefile());
   this->LocalGenerators.push_back(lg);
@@ -1986,12 +1986,6 @@ void cmGlobalGenerator::EnableInstallTarget()
   this->InstallTargetEnabled = true;
 }
 
-cmLocalGenerator *
-cmGlobalGenerator::MakeLocalGenerator(cmState::Snapshot snapshot)
-{
-  return this->CreateLocalGenerator(snapshot);
-}
-
 cmLocalGenerator*
 cmGlobalGenerator::CreateLocalGenerator(cmState::Snapshot snapshot)
 {

Source/cmGlobalGenerator.h

@@ -56,8 +56,8 @@ public:
   cmGlobalGenerator(cmake* cm);
   virtual ~cmGlobalGenerator();
 
-  cmLocalGenerator*
-  MakeLocalGenerator(cmState::Snapshot snapshot = cmState::Snapshot());
+  virtual cmLocalGenerator*
+  CreateLocalGenerator(cmState::Snapshot snapshot = cmState::Snapshot());
 
   ///! Get the name for this generator
   virtual std::string GetName() const { return "Generic"; }
@@ -440,9 +440,6 @@ protected:
   virtual bool UseFolderProperty();
 
 private:
-  ///! Create a local generator appropriate to this Global Generator
-  virtual cmLocalGenerator *CreateLocalGenerator(cmState::Snapshot snapshot);
-
   cmMakefile* TryCompileOuterMakefile;
   // If you add a new map here, make sure it is copied
   // in EnableLanguagesFromGenerator

Source/cmGlobalUnixMakefileGenerator3.cxx

@@ -587,7 +587,7 @@ void cmGlobalUnixMakefileGenerator3
       {
       cmState::Snapshot snapshot = this->CMakeInstance->GetCurrentSnapshot();
       lg = static_cast<cmLocalUnixMakefileGenerator3 *>
-        (this->MakeLocalGenerator(snapshot));
+        (this->CreateLocalGenerator(snapshot));
       // set the Start directories
       lg->GetMakefile()->SetCurrentSourceDirectory
         (this->CMakeInstance->GetHomeDirectory());

Source/cmGraphVizWriter.cxx

@@ -69,7 +69,7 @@ void cmGraphVizWriter::ReadSettings(const char* settingsFileName,
   cm.SetHomeOutputDirectory("");
   cmGlobalGenerator ggi(&cm);
   cmsys::auto_ptr<cmLocalGenerator> lg(
-        ggi.MakeLocalGenerator(cm.GetCurrentSnapshot()));
+        ggi.CreateLocalGenerator(cm.GetCurrentSnapshot()));
   cmMakefile *mf = lg->GetMakefile();
 
   const char* inFileName = settingsFileName;

Source/cmMakefile.cxx

@@ -1756,7 +1756,7 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
 
   // create a new local generator and set its parent
   cmLocalGenerator *lg2 = this->GetGlobalGenerator()
-        ->MakeLocalGenerator(newSnapshot);
+        ->CreateLocalGenerator(newSnapshot);
   this->GetGlobalGenerator()->AddMakefile(lg2->GetMakefile());
   this->GetGlobalGenerator()->AddLocalGenerator(lg2);
 

Source/cmQtAutoGenerators.cxx

@@ -1218,7 +1218,7 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory,
   cmGlobalGenerator gg(&cm);
 
   cmState::Snapshot snapshot = cm.GetCurrentSnapshot();
-  cmLocalGenerator* lg = gg.MakeLocalGenerator(snapshot);
+  cmLocalGenerator* lg = gg.CreateLocalGenerator(snapshot);
   lg->GetMakefile()->SetCurrentBinaryDirectory(targetDirectory);
   lg->GetMakefile()->SetCurrentSourceDirectory(targetDirectory);
   gg.SetCurrentMakefile(lg->GetMakefile());

Source/cmake.cxx

@@ -430,7 +430,7 @@ void cmake::ReadListFile(const std::vector<std::string>& args,
     this->SetHomeDirectory(cmSystemTools::GetCurrentWorkingDirectory());
     this->SetHomeOutputDirectory(cmSystemTools::GetCurrentWorkingDirectory());
     cmState::Snapshot snapshot = this->GetCurrentSnapshot();
-    cmsys::auto_ptr<cmLocalGenerator> lg(gg->MakeLocalGenerator(snapshot));
+    cmsys::auto_ptr<cmLocalGenerator> lg(gg->CreateLocalGenerator(snapshot));
     lg->GetMakefile()->SetCurrentBinaryDirectory
       (cmSystemTools::GetCurrentWorkingDirectory());
     lg->GetMakefile()->SetCurrentSourceDirectory
@@ -472,7 +472,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
 
   cmState::Snapshot snapshot = this->GetCurrentSnapshot();
   // read in the list file to fill the cache
-  cmsys::auto_ptr<cmLocalGenerator> lg(gg->MakeLocalGenerator(snapshot));
+  cmsys::auto_ptr<cmLocalGenerator> lg(gg->CreateLocalGenerator(snapshot));
   cmMakefile* mf = lg->GetMakefile();
   mf->SetCurrentBinaryDirectory
     (cmSystemTools::GetCurrentWorkingDirectory());
@@ -2062,7 +2062,7 @@ int cmake::CheckBuildSystem()
   cm.SetHomeOutputDirectory("");
   cmGlobalGenerator gg(&cm);
   cmsys::auto_ptr<cmLocalGenerator> lg(
-        gg.MakeLocalGenerator(cm.GetCurrentSnapshot()));
+        gg.CreateLocalGenerator(cm.GetCurrentSnapshot()));
   cmMakefile* mf = lg->GetMakefile();
   if(!mf->ReadListFile(this->CheckBuildSystemArgument.c_str()) ||
      cmSystemTools::GetErrorOccuredFlag())
@@ -2093,7 +2093,7 @@ int cmake::CheckBuildSystem()
     if(ggd.get())
       {
       cmsys::auto_ptr<cmLocalGenerator> lgd(
-            ggd->MakeLocalGenerator(cm.GetCurrentSnapshot()));
+            ggd->CreateLocalGenerator(cm.GetCurrentSnapshot()));
       lgd->ClearDependencies(mf, verbose);
       }
     }

Source/cmcmd.cxx

@@ -770,7 +770,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
         cm.SetGlobalGenerator(ggd);
         cmState::Snapshot snapshot = cm.GetCurrentSnapshot();
         cmsys::auto_ptr<cmLocalGenerator> lgd(
-              ggd->MakeLocalGenerator(snapshot));
+              ggd->CreateLocalGenerator(snapshot));
         lgd->GetMakefile()->SetCurrentSourceDirectory(startDir);
         lgd->GetMakefile()->SetCurrentBinaryDirectory(startOutDir);