diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-19 22:18:19 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-05-19 22:30:13 (GMT) |
| commit | c95a55ad5ab99a817c79558a5a7d8aaeb34a131b (patch) | |
| tree | 23071036765da7e30e92d23bd07126070d6fbc8a /Source | |
| parent | 460e8fb9ad4eb58e06cefa0fce0df6f14644af4e (diff) | |
| download | CMake-c95a55ad5ab99a817c79558a5a7d8aaeb34a131b.zip CMake-c95a55ad5ab99a817c79558a5a7d8aaeb34a131b.tar.gz CMake-c95a55ad5ab99a817c79558a5a7d8aaeb34a131b.tar.bz2 | |
QtAutogen: Remove the need for a local makefile variable.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 853a706..68f8d09 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -1218,16 +1218,14 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory, lg->GetMakefile()->SetCurrentSourceDirectory(targetDirectory); gg->SetCurrentLocalGenerator(lg); - cmMakefile* makefile = gg->GetCurrentLocalGenerator()->GetMakefile(); - - this->ReadAutogenInfoFile(makefile, targetDirectory, config); - this->ReadOldMocDefinitionsFile(makefile, targetDirectory); + this->ReadAutogenInfoFile(lg->GetMakefile(), targetDirectory, config); + this->ReadOldMocDefinitionsFile(lg->GetMakefile(), targetDirectory); this->Init(); if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5") { - success = this->RunAutogen(makefile); + success = this->RunAutogen(lg->GetMakefile()); } this->WriteOldMocDefinitionsFile(targetDirectory); @@ -1235,7 +1233,6 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory, delete gg->GetCurrentLocalGenerator(); delete gg; gg = NULL; - makefile = NULL; return success; } |