diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-08 17:08:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-08 17:08:30 (GMT) |
| commit | db266aaade6ac6e7a37be11338b0f8336976ead2 (patch) | |
| tree | 8cb12a93f0567100cf8d1937383b8ce6f66c6b9a /Source/cmGlobalGenerator.cxx | |
| parent | 45e9f48f9ca51f2bd32a8dd09ce58cf2ec4197e5 (diff) | |
| parent | 28749903b67d71b35f6ff74dab7c6db1a648a1c8 (diff) | |
| download | CMake-db266aaade6ac6e7a37be11338b0f8336976ead2.zip CMake-db266aaade6ac6e7a37be11338b0f8336976ead2.tar.gz CMake-db266aaade6ac6e7a37be11338b0f8336976ead2.tar.bz2 | |
Merge topic 'refactor-current-dir-initialization'
28749903 cmState: Internalize the initialization of a snapshot from its parent.
6c02f62f Remove now-unused directory setters.
360e4e1d Set the current dirs on the snapshot before creating the cmMakefile.
f716460e cmMakefile: Move invokation to initialize snapshot.
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()); |