From 0368552d7fcdd35a0cb52043a8567e66d62bccd3 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 28 Jul 2015 18:58:26 +0200 Subject: cmGlobalGenerator: Move QtAutogen handling to Compute(). --- Source/cmGlobalGenerator.cxx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index b79576c..463f526 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1230,11 +1230,6 @@ bool cmGlobalGenerator::Compute() this->CreateGenerationObjects(); - return true; -} - -void cmGlobalGenerator::Generate() -{ #ifdef CMAKE_BUILD_WITH_CMAKE // Iterate through all targets and set up automoc for those which have // the AUTOMOC, AUTOUIC or AUTORCC property set @@ -1265,6 +1260,13 @@ void cmGlobalGenerator::Generate() } #endif + return true; +} + +void cmGlobalGenerator::Generate() +{ + unsigned int i; + // Trace the dependencies, after that no custom commands should be added // because their dependencies might not be handled correctly for (i = 0; i < this->LocalGenerators.size(); ++i) -- cgit v0.12