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/cmGlobalGenerator.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/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 01f50ed..251fa52 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1128,7 +1128,8 @@ void cmGlobalGenerator::Configure() this->ClearGeneratorMembers(); // start with this directory - cmLocalGenerator *lg = this->MakeLocalGenerator(); + cmLocalGenerator *lg = this->MakeLocalGenerator( + this->GetCMakeInstance()->GetCurrentSnapshot()); this->Makefiles.push_back(lg->GetMakefile()); this->LocalGenerators.push_back(lg); @@ -1988,11 +1989,6 @@ void cmGlobalGenerator::EnableInstallTarget() cmLocalGenerator * cmGlobalGenerator::MakeLocalGenerator(cmState::Snapshot snapshot) { - if (!snapshot.IsValid()) - { - snapshot = this->CMakeInstance->GetCurrentSnapshot(); - } - return this->CreateLocalGenerator(snapshot); } |