diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-09-26 17:41:31 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-09-29 13:56:23 (GMT) |
commit | 1fe390201df041cebcfcb5e6cc401f8ece2d6072 (patch) | |
tree | 02671a84d2d7b8104f3ca1c9f5a8b352731301a9 /Source/cmQtAutoGenerators.cxx | |
parent | 59a729b2be6614427f3fd74f60412f17e6618d30 (diff) | |
download | CMake-1fe390201df041cebcfcb5e6cc401f8ece2d6072.zip CMake-1fe390201df041cebcfcb5e6cc401f8ece2d6072.tar.gz CMake-1fe390201df041cebcfcb5e6cc401f8ece2d6072.tar.bz2 |
QtAutogen: Port away from cmLocalGenerator.
Diffstat (limited to 'Source/cmQtAutoGenerators.cxx')
-rw-r--r-- | Source/cmQtAutoGenerators.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 3a0253e..bbeb3dc 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -12,7 +12,7 @@ ============================================================================*/ #include "cmGlobalGenerator.h" -#include "cmLocalGenerator.h" +#include "cmOutputConverter.h" #include "cmMakefile.h" #include "cmSystemTools.h" #include "cmState.h" @@ -179,19 +179,18 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory, cmState::Snapshot snapshot = cm.GetCurrentSnapshot(); cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, snapshot)); - cmsys::auto_ptr<cmLocalGenerator> lg(gg.CreateLocalGenerator(mf.get())); - lg->GetMakefile()->SetCurrentBinaryDirectory(targetDirectory); - lg->GetMakefile()->SetCurrentSourceDirectory(targetDirectory); - gg.SetCurrentMakefile(lg->GetMakefile()); + mf->SetCurrentBinaryDirectory(targetDirectory); + mf->SetCurrentSourceDirectory(targetDirectory); + gg.SetCurrentMakefile(mf.get()); - this->ReadAutogenInfoFile(lg->GetMakefile(), targetDirectory, config); - this->ReadOldMocDefinitionsFile(lg->GetMakefile(), targetDirectory); + this->ReadAutogenInfoFile(mf.get(), targetDirectory, config); + this->ReadOldMocDefinitionsFile(mf.get(), targetDirectory); this->Init(); if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5") { - success = this->RunAutogen(lg->GetMakefile()); + success = this->RunAutogen(mf.get()); } this->WriteOldMocDefinitionsFile(targetDirectory); |