This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 22ba7f85f56861954b3a9cda1e55c5d7b77071cc (commit) via a5b59fae15767be07fcc0c3750b706d3ed50f1f5 (commit) via fe401ede2a6d8eb845005d26487c96f42d8425fc (commit) via c95a55ad5ab99a817c79558a5a7d8aaeb34a131b (commit) via 460e8fb9ad4eb58e06cefa0fce0df6f14644af4e (commit) via 58f41c789ffd102cdf3c9c8e49a2fe3b5da21a0b (commit) from 81d579b970b4ff4f71102cd9659c901bcf9ab2a5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22ba7f85f56861954b3a9cda1e55c5d7b77071cc commit 22ba7f85f56861954b3a9cda1e55c5d7b77071cc Merge: 81d579b a5b59fa Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Tue May 19 18:33:24 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue May 19 18:33:24 2015 -0400 Merge topic 'clean-up-cmQtAutoGenerators' into next a5b59fae QtAutogen: Create global generator on the stack. fe401ede QtAutogen: Use a more-obvious delete-target. c95a55ad QtAutogen: Remove the need for a local makefile variable. 460e8fb9 QtAutogen: Inline static factory method. 58f41c78 QtAutogen: Remove repeated setters. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5b59fae15767be07fcc0c3750b706d3ed50f1f5 commit a5b59fae15767be07fcc0c3750b706d3ed50f1f5 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed May 20 00:21:20 2015 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Wed May 20 00:30:16 2015 +0200 QtAutogen: Create global generator on the stack. diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 7d389c0..d963f99 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -1210,13 +1210,13 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory, cmake cm; cm.SetHomeOutputDirectory(targetDirectory); cm.SetHomeDirectory(targetDirectory); - cmGlobalGenerator* gg = new cmGlobalGenerator(); - gg->SetCMakeInstance(&cm); + cmGlobalGenerator gg; + gg.SetCMakeInstance(&cm); - cmLocalGenerator* lg = gg->MakeLocalGenerator(); + cmLocalGenerator* lg = gg.MakeLocalGenerator(); lg->GetMakefile()->SetCurrentBinaryDirectory(targetDirectory); lg->GetMakefile()->SetCurrentSourceDirectory(targetDirectory); - gg->SetCurrentLocalGenerator(lg); + gg.SetCurrentLocalGenerator(lg); this->ReadAutogenInfoFile(lg->GetMakefile(), targetDirectory, config); this->ReadOldMocDefinitionsFile(lg->GetMakefile(), targetDirectory); @@ -1231,8 +1231,6 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory, this->WriteOldMocDefinitionsFile(targetDirectory); delete lg; - delete gg; - gg = NULL; return success; } http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe401ede2a6d8eb845005d26487c96f42d8425fc commit fe401ede2a6d8eb845005d26487c96f42d8425fc Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed May 20 00:20:21 2015 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Wed May 20 00:30:15 2015 +0200 QtAutogen: Use a more-obvious delete-target. diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 68f8d09..7d389c0 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -1230,7 +1230,7 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory, this->WriteOldMocDefinitionsFile(targetDirectory); - delete gg->GetCurrentLocalGenerator(); + delete lg; delete gg; gg = NULL; return success; http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c95a55ad5ab99a817c79558a5a7d8aaeb34a131b commit c95a55ad5ab99a817c79558a5a7d8aaeb34a131b Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed May 20 00:18:19 2015 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Wed May 20 00:30:13 2015 +0200 QtAutogen: Remove the need for a local makefile variable. 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; } http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=460e8fb9ad4eb58e06cefa0fce0df6f14644af4e commit 460e8fb9ad4eb58e06cefa0fce0df6f14644af4e Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed May 20 00:17:30 2015 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Wed May 20 00:23:28 2015 +0200 QtAutogen: Inline static factory method. diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 79e7f70..853a706 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -1203,28 +1203,21 @@ std::string cmQtAutoGenerators::GetRccExecutable(cmTarget const* target) return std::string(); } -static cmGlobalGenerator* CreateGlobalGenerator(cmake* cm, - const std::string& targetDirectory) +bool cmQtAutoGenerators::Run(const std::string& targetDirectory, + const std::string& config) { + bool success = true; + cmake cm; + cm.SetHomeOutputDirectory(targetDirectory); + cm.SetHomeDirectory(targetDirectory); cmGlobalGenerator* gg = new cmGlobalGenerator(); - gg->SetCMakeInstance(cm); + gg->SetCMakeInstance(&cm); cmLocalGenerator* lg = gg->MakeLocalGenerator(); lg->GetMakefile()->SetCurrentBinaryDirectory(targetDirectory); lg->GetMakefile()->SetCurrentSourceDirectory(targetDirectory); gg->SetCurrentLocalGenerator(lg); - return gg; -} - -bool cmQtAutoGenerators::Run(const std::string& targetDirectory, - const std::string& config) -{ - bool success = true; - cmake cm; - cm.SetHomeOutputDirectory(targetDirectory); - cm.SetHomeDirectory(targetDirectory); - cmGlobalGenerator* gg = CreateGlobalGenerator(&cm, targetDirectory); cmMakefile* makefile = gg->GetCurrentLocalGenerator()->GetMakefile(); this->ReadAutogenInfoFile(makefile, targetDirectory, config); http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58f41c789ffd102cdf3c9c8e49a2fe3b5da21a0b commit 58f41c789ffd102cdf3c9c8e49a2fe3b5da21a0b Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed May 20 00:22:51 2015 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Wed May 20 00:22:51 2015 +0200 QtAutogen: Remove repeated setters. These methods are called already just before calling the static method. diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 3e7989f..79e7f70 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -1209,9 +1209,6 @@ static cmGlobalGenerator* CreateGlobalGenerator(cmake* cm, cmGlobalGenerator* gg = new cmGlobalGenerator(); gg->SetCMakeInstance(cm); - cm->SetHomeOutputDirectory(targetDirectory); - cm->SetHomeDirectory(targetDirectory); - cmLocalGenerator* lg = gg->MakeLocalGenerator(); lg->GetMakefile()->SetCurrentBinaryDirectory(targetDirectory); lg->GetMakefile()->SetCurrentSourceDirectory(targetDirectory); ----------------------------------------------------------------------- Summary of changes: Source/cmQtAutoGenerators.cxx | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits