diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-30 23:43:31 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-28 16:44:38 (GMT) |
| commit | acb006229dbc531303538f4de1dc4d16d27369a5 (patch) | |
| tree | 72c546947ad69df5c89662f9b0a2a53e6f76ed81 /Source/cmake.cxx | |
| parent | 83b8a927e5a992480e96b0be36ea0426a924c41f (diff) | |
| download | CMake-acb006229dbc531303538f4de1dc4d16d27369a5.zip CMake-acb006229dbc531303538f4de1dc4d16d27369a5.tar.gz CMake-acb006229dbc531303538f4de1dc4d16d27369a5.tar.bz2 | |
cmGlobalGenerator: Require a snapshot to create a local generator.
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 1f5c4d4..29271b8 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -429,7 +429,8 @@ void cmake::ReadListFile(const std::vector<std::string>& args, std::string homeOutputDir = this->GetHomeOutputDirectory(); this->SetHomeDirectory(cmSystemTools::GetCurrentWorkingDirectory()); this->SetHomeOutputDirectory(cmSystemTools::GetCurrentWorkingDirectory()); - cmsys::auto_ptr<cmLocalGenerator> lg(gg->MakeLocalGenerator()); + cmState::Snapshot snapshot = this->GetCurrentSnapshot(); + cmsys::auto_ptr<cmLocalGenerator> lg(gg->MakeLocalGenerator(snapshot)); lg->GetMakefile()->SetCurrentBinaryDirectory (cmSystemTools::GetCurrentWorkingDirectory()); lg->GetMakefile()->SetCurrentSourceDirectory @@ -469,8 +470,9 @@ bool cmake::FindPackage(const std::vector<std::string>& args) cmGlobalGenerator *gg = new cmGlobalGenerator(this); this->SetGlobalGenerator(gg); + cmState::Snapshot snapshot = this->GetCurrentSnapshot(); // read in the list file to fill the cache - cmsys::auto_ptr<cmLocalGenerator> lg(gg->MakeLocalGenerator()); + cmsys::auto_ptr<cmLocalGenerator> lg(gg->MakeLocalGenerator(snapshot)); cmMakefile* mf = lg->GetMakefile(); mf->SetCurrentBinaryDirectory (cmSystemTools::GetCurrentWorkingDirectory()); @@ -2059,7 +2061,8 @@ int cmake::CheckBuildSystem() cm.SetHomeDirectory(""); cm.SetHomeOutputDirectory(""); cmGlobalGenerator gg(&cm); - cmsys::auto_ptr<cmLocalGenerator> lg(gg.MakeLocalGenerator()); + cmsys::auto_ptr<cmLocalGenerator> lg( + gg.MakeLocalGenerator(cm.GetCurrentSnapshot())); cmMakefile* mf = lg->GetMakefile(); if(!mf->ReadListFile(this->CheckBuildSystemArgument.c_str()) || cmSystemTools::GetErrorOccuredFlag()) @@ -2089,7 +2092,8 @@ int cmake::CheckBuildSystem() ggd(this->CreateGlobalGenerator(genName)); if(ggd.get()) { - cmsys::auto_ptr<cmLocalGenerator> lgd(ggd->MakeLocalGenerator()); + cmsys::auto_ptr<cmLocalGenerator> lgd( + ggd->MakeLocalGenerator(cm.GetCurrentSnapshot())); lgd->ClearDependencies(mf, verbose); } } |