diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-30 23:57:04 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-07 18:19:41 (GMT) |
| commit | 360e4e1db0cc89ea4f092eeb1ba1e6df8ee782b7 (patch) | |
| tree | ddc52c40a5a4124c0441471627a27bdd2c79af00 /Source/cmGlobalGenerator.cxx | |
| parent | f716460ed82134bd1ca09f49bfa507cb2645d96c (diff) | |
| download | CMake-360e4e1db0cc89ea4f092eeb1ba1e6df8ee782b7.zip CMake-360e4e1db0cc89ea4f092eeb1ba1e6df8ee782b7.tar.gz CMake-360e4e1db0cc89ea4f092eeb1ba1e6df8ee782b7.tar.bz2 | |
Set the current dirs on the snapshot before creating the cmMakefile.
The cmMakefile should get a fully prepared snapshot and not clobber its
definitions. It should eventually be able to process list files from any
starting-point snapshot, though that is some refactoring away still.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 05f1029..715a927 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1108,16 +1108,16 @@ void cmGlobalGenerator::Configure() this->FirstTimeProgress = 0.0f; this->ClearGeneratorMembers(); - cmMakefile* dirMf = - new cmMakefile(this, this->GetCMakeInstance()->GetCurrentSnapshot()); - this->Makefiles.push_back(dirMf); + cmState::Snapshot snapshot = this->CMakeInstance->GetCurrentSnapshot(); - // set the Start directories - dirMf->SetCurrentSourceDirectory + snapshot.GetDirectory().SetCurrentSource (this->CMakeInstance->GetHomeDirectory()); - dirMf->SetCurrentBinaryDirectory + snapshot.GetDirectory().SetCurrentBinary (this->CMakeInstance->GetHomeOutputDirectory()); + cmMakefile* dirMf = new cmMakefile(this, snapshot); + this->Makefiles.push_back(dirMf); + this->BinaryDirectories.insert( this->CMakeInstance->GetHomeOutputDirectory()); |