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

QtAutogen: Move condition to prior loop.

Browse Source
This commit is contained in:
Stephen Kelly 2015-09-20 16:52:32 +02:00
parent b7491b1cda
commit 9470b056fc
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/cmGlobalGenerator.cxx
View File

@ -1429,6 +1429,13 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens)
{ {
continue; continue;
} }
if((!ti->second.GetPropertyAsBool("AUTOMOC")
&& !ti->second.GetPropertyAsBool("AUTOUIC")
&& !ti->second.GetPropertyAsBool("AUTORCC"))
|| ti->second.IsImported())
{
continue;
}
targetNames.push_back(ti->second.GetName()); targetNames.push_back(ti->second.GetName());
} }
for(std::vector<std::string>::iterator ti = targetNames.begin(); for(std::vector<std::string>::iterator ti = targetNames.begin();
@ -1436,17 +1443,12 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens)
{ {
cmTarget& target = *this->LocalGenerators[i] cmTarget& target = *this->LocalGenerators[i]
->GetMakefile()->FindTarget(*ti, true); ->GetMakefile()->FindTarget(*ti, true);
if((target.GetPropertyAsBool("AUTOMOC")
|| target.GetPropertyAsBool("AUTOUIC") if(cmQtAutoGenerators::InitializeAutogenTarget(
|| target.GetPropertyAsBool("AUTORCC")) this->LocalGenerators[i], &target))
&& !target.IsImported())
{ {
if(cmQtAutoGenerators::InitializeAutogenTarget( cmQtAutoGenerators autogen;
this->LocalGenerators[i], &target)) autogens.push_back(std::make_pair(autogen, &target));
{
cmQtAutoGenerators autogen;
autogens.push_back(std::make_pair(autogen, &target));
}
} }
} }
} }