kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGlobalGenerator: Move QtAutogen handling to Compute().

This commit is contained in:
Stephen Kelly 2015-07-28 18:58:26 +02:00
parent 5edb335485
commit 0368552d7f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmGlobalGenerator.cxx
View File

@ -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)