From 92041eec49ab4968b2d4f09e3bd71a3720d86036 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 2 Aug 2015 11:30:12 +0200 Subject: cmGlobalGenerator: Remove MakeLocalGenerator method. Inline implementation to callers. --- Source/CPack/cmCPackGenerator.cxx | 2 +- Source/CPack/cpack.cxx | 2 +- Source/CTest/cmCTestLaunch.cxx | 2 +- Source/CTest/cmCTestScriptHandler.cxx | 2 +- Source/CTest/cmCTestTestHandler.cxx | 2 +- Source/cmCTest.cxx | 2 +- Source/cmGlobalGenerator.cxx | 8 +------- Source/cmGlobalGenerator.h | 7 ++----- Source/cmGlobalUnixMakefileGenerator3.cxx | 2 +- Source/cmGraphVizWriter.cxx | 2 +- Source/cmMakefile.cxx | 2 +- Source/cmQtAutoGenerators.cxx | 2 +- Source/cmake.cxx | 8 ++++---- Source/cmcmd.cxx | 2 +- 14 files changed, 18 insertions(+), 27 deletions(-) diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 68509a5..8cbcd4e 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -717,7 +717,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( cm.SetProgressCallback(cmCPackGeneratorProgress, this); cmGlobalGenerator gg(&cm); cmsys::auto_ptr lg( - gg.MakeLocalGenerator(cm.GetCurrentSnapshot())); + gg.CreateLocalGenerator(cm.GetCurrentSnapshot())); cmMakefile *mf = lg->GetMakefile(); std::string realInstallDirectory = tempInstallDirectory; if ( !installSubDirectory.empty() && installSubDirectory != "/" ) diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 0c53d1b..96351f7 100644 --- a/Source/CPack/cpack.cxx +++ b/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 cmlg( - cmgg.MakeLocalGenerator(cminst.GetCurrentSnapshot())); + cmgg.CreateLocalGenerator(cminst.GetCurrentSnapshot())); cmMakefile* globalMF = cmlg->GetMakefile(); #if defined(__CYGWIN__) globalMF->AddDefinition("CMAKE_LEGACY_CYGWIN_WIN32", "0"); diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx index d978568..7340d5c 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -739,7 +739,7 @@ void cmCTestLaunch::LoadConfig() cm.SetHomeOutputDirectory(""); cmGlobalGenerator gg(&cm); cmsys::auto_ptr lg( - gg.MakeLocalGenerator(cm.GetCurrentSnapshot())); + gg.CreateLocalGenerator(cm.GetCurrentSnapshot())); cmMakefile* mf = lg->GetMakefile(); std::string fname = this->LogDir; fname += "CTestLaunchConfig.cmake"; diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index c791302..8327f29 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/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); diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 3262efd..9e00193 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1593,7 +1593,7 @@ void cmCTestTestHandler::GetListOfTests() cm.SetHomeOutputDirectory(""); cmGlobalGenerator gg(&cm); cmsys::auto_ptr lg( - gg.MakeLocalGenerator(cm.GetCurrentSnapshot())); + gg.CreateLocalGenerator(cm.GetCurrentSnapshot())); cmMakefile *mf = lg->GetMakefile(); mf->AddDefinition("CTEST_CONFIGURATION_TYPE", this->CTest->GetConfigType().c_str()); diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index f020f9e..1786c2c 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -521,7 +521,7 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command) cm.SetHomeOutputDirectory(""); cmGlobalGenerator gg(&cm); cmsys::auto_ptr lg( - gg.MakeLocalGenerator(cm.GetCurrentSnapshot())); + gg.CreateLocalGenerator(cm.GetCurrentSnapshot())); cmMakefile *mf = lg->GetMakefile(); if ( !this->ReadCustomConfigurationFileTree(this->BinaryDir.c_str(), mf) ) { diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 251fa52..fba14e5 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/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) { diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 2e0f7b5..91c1aac 100644 --- a/Source/cmGlobalGenerator.h +++ b/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 diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index c396af4..0d4ee15 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -587,7 +587,7 @@ void cmGlobalUnixMakefileGenerator3 { cmState::Snapshot snapshot = this->CMakeInstance->GetCurrentSnapshot(); lg = static_cast - (this->MakeLocalGenerator(snapshot)); + (this->CreateLocalGenerator(snapshot)); // set the Start directories lg->GetMakefile()->SetCurrentSourceDirectory (this->CMakeInstance->GetHomeDirectory()); diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx index 797b198..7da3085 100644 --- a/Source/cmGraphVizWriter.cxx +++ b/Source/cmGraphVizWriter.cxx @@ -69,7 +69,7 @@ void cmGraphVizWriter::ReadSettings(const char* settingsFileName, cm.SetHomeOutputDirectory(""); cmGlobalGenerator ggi(&cm); cmsys::auto_ptr lg( - ggi.MakeLocalGenerator(cm.GetCurrentSnapshot())); + ggi.CreateLocalGenerator(cm.GetCurrentSnapshot())); cmMakefile *mf = lg->GetMakefile(); const char* inFileName = settingsFileName; diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 10ce0b3..1df6213 100644 --- a/Source/cmMakefile.cxx +++ b/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); diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index c6c045a..9cb005c 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/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()); diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 29271b8..ebc38d8 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -430,7 +430,7 @@ void cmake::ReadListFile(const std::vector& args, this->SetHomeDirectory(cmSystemTools::GetCurrentWorkingDirectory()); this->SetHomeOutputDirectory(cmSystemTools::GetCurrentWorkingDirectory()); cmState::Snapshot snapshot = this->GetCurrentSnapshot(); - cmsys::auto_ptr lg(gg->MakeLocalGenerator(snapshot)); + cmsys::auto_ptr lg(gg->CreateLocalGenerator(snapshot)); lg->GetMakefile()->SetCurrentBinaryDirectory (cmSystemTools::GetCurrentWorkingDirectory()); lg->GetMakefile()->SetCurrentSourceDirectory @@ -472,7 +472,7 @@ bool cmake::FindPackage(const std::vector& args) cmState::Snapshot snapshot = this->GetCurrentSnapshot(); // read in the list file to fill the cache - cmsys::auto_ptr lg(gg->MakeLocalGenerator(snapshot)); + cmsys::auto_ptr 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 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 lgd( - ggd->MakeLocalGenerator(cm.GetCurrentSnapshot())); + ggd->CreateLocalGenerator(cm.GetCurrentSnapshot())); lgd->ClearDependencies(mf, verbose); } } diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 868dbe3..c788474 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -770,7 +770,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector& args) cm.SetGlobalGenerator(ggd); cmState::Snapshot snapshot = cm.GetCurrentSnapshot(); cmsys::auto_ptr lgd( - ggd->MakeLocalGenerator(snapshot)); + ggd->CreateLocalGenerator(snapshot)); lgd->GetMakefile()->SetCurrentSourceDirectory(startDir); lgd->GetMakefile()->SetCurrentBinaryDirectory(startOutDir); -- cgit v0.12