diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-05-31 01:57:04 +0200 |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-10-07 20:19:41 +0200 |
commit | 360e4e1db0cc89ea4f092eeb1ba1e6df8ee782b7 (patch) | |
tree | ddc52c40a5a4124c0441471627a27bdd2c79af00 /Source/cmGlobalUnixMakefileGenerator3.cxx | |
parent | f716460ed82134bd1ca09f49bfa507cb2645d96c (diff) | |
download | cmake-360e4e1db0cc89ea4f092eeb1ba1e6df8ee782b7.tar.gz |
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/cmGlobalUnixMakefileGenerator3.cxx')
-rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 0064713f2b..cb13fcfbd0 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -585,12 +585,11 @@ void cmGlobalUnixMakefileGenerator3 else { cmState::Snapshot snapshot = this->CMakeInstance->GetCurrentSnapshot(); - mf = new cmMakefile(this, snapshot); - // set the Start directories - mf->SetCurrentSourceDirectory + snapshot.GetDirectory().SetCurrentSource (this->CMakeInstance->GetHomeDirectory()); - mf->SetCurrentBinaryDirectory + snapshot.GetDirectory().SetCurrentBinary (this->CMakeInstance->GetHomeOutputDirectory()); + mf = new cmMakefile(this, snapshot); } std::string tname = targetName; |