diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-20 14:52:32 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-09-26 17:32:53 (GMT) |
| commit | 9470b056fc0be0910f90230e0635d4a2e2baa81a (patch) | |
| tree | f9c30c2a75005601a2ff9d7556667819ceb937bc | |
| parent | b7491b1cda7096aa914c79a1b2fc7768e90aa951 (diff) | |
| download | CMake-9470b056fc0be0910f90230e0635d4a2e2baa81a.zip CMake-9470b056fc0be0910f90230e0635d4a2e2baa81a.tar.gz CMake-9470b056fc0be0910f90230e0635d4a2e2baa81a.tar.bz2 | |
QtAutogen: Move condition to prior loop.
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 82d8d39..f9a65ee 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1429,6 +1429,13 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens) { continue; } + if((!ti->second.GetPropertyAsBool("AUTOMOC") + && !ti->second.GetPropertyAsBool("AUTOUIC") + && !ti->second.GetPropertyAsBool("AUTORCC")) + || ti->second.IsImported()) + { + continue; + } targetNames.push_back(ti->second.GetName()); } for(std::vector<std::string>::iterator ti = targetNames.begin(); @@ -1436,17 +1443,12 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens) { cmTarget& target = *this->LocalGenerators[i] ->GetMakefile()->FindTarget(*ti, true); - if((target.GetPropertyAsBool("AUTOMOC") - || target.GetPropertyAsBool("AUTOUIC") - || target.GetPropertyAsBool("AUTORCC")) - && !target.IsImported()) + + if(cmQtAutoGenerators::InitializeAutogenTarget( + this->LocalGenerators[i], &target)) { - if(cmQtAutoGenerators::InitializeAutogenTarget( - this->LocalGenerators[i], &target)) - { - cmQtAutoGenerators autogen; - autogens.push_back(std::make_pair(autogen, &target)); - } + cmQtAutoGenerators autogen; + autogens.push_back(std::make_pair(autogen, &target)); } } } |