diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-07-28 16:58:26 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-07-30 06:28:31 (GMT) |
| commit | 0368552d7fcdd35a0cb52043a8567e66d62bccd3 (patch) | |
| tree | 77eb35a971d7d3faf3c311a3a570b1d8ef457489 | |
| parent | 5edb3354854bd2de4f9ea0e2c4af4069f46a4830 (diff) | |
| download | CMake-0368552d7fcdd35a0cb52043a8567e66d62bccd3.zip CMake-0368552d7fcdd35a0cb52043a8567e66d62bccd3.tar.gz CMake-0368552d7fcdd35a0cb52043a8567e66d62bccd3.tar.bz2 | |
cmGlobalGenerator: Move QtAutogen handling to Compute().
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 12 |
1 files 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) |