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/cmQtAutoGenerators.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/cmQtAutoGenerators.cxx')
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index bbeb3dc..36b1305 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -178,9 +178,10 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory, cmGlobalGenerator gg(&cm); cmState::Snapshot snapshot = cm.GetCurrentSnapshot(); + snapshot.GetDirectory().SetCurrentBinary(targetDirectory); + snapshot.GetDirectory().SetCurrentSource(targetDirectory); + cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, snapshot)); - mf->SetCurrentBinaryDirectory(targetDirectory); - mf->SetCurrentSourceDirectory(targetDirectory); gg.SetCurrentMakefile(mf.get()); this->ReadAutogenInfoFile(mf.get(), targetDirectory, config); |