diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-20 16:55:47 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-09-26 19:32:53 +0200 |
| commit | 8b6ec29d4096b4ea59ef502360845e25a9bcb47e (patch) | |
| tree | 7c1cb936426d9778397fa16df02c47310db4d12e /Source/cmQtAutoGenerators.cxx | |
| parent | 9470b056fc0be0910f90230e0635d4a2e2baa81a (diff) | |
| download | cmake-8b6ec29d4096b4ea59ef502360845e25a9bcb47e.tar.gz | |
QtAutogen: Move initialization condition to caller.
Diffstat (limited to 'Source/cmQtAutoGenerators.cxx')
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 6fee69ed5e..04d7bbcbd1 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -286,20 +286,10 @@ std::string cmQtAutoGenerators::ListQt4RccInputs(cmSourceFile* sf, return entriesList; } -bool cmQtAutoGenerators::InitializeAutogenTarget(cmLocalGenerator* lg, +void cmQtAutoGenerators::InitializeAutogenTarget(cmLocalGenerator* lg, cmTarget* target) { cmMakefile* makefile = target->GetMakefile(); - // don't do anything if there is no Qt4 or Qt5Core (which contains moc): - std::string qtMajorVersion = makefile->GetSafeDefinition("QT_VERSION_MAJOR"); - if (qtMajorVersion == "") - { - qtMajorVersion = makefile->GetSafeDefinition("Qt5Core_VERSION_MAJOR"); - } - if (qtMajorVersion != "4" && qtMajorVersion != "5") - { - return false; - } if (target->GetPropertyAsBool("AUTOMOC")) { @@ -499,8 +489,6 @@ bool cmQtAutoGenerators::InitializeAutogenTarget(cmLocalGenerator* lg, target->AddUtility(autogenTargetName); } - - return true; } static void GetCompileDefinitionsAndDirectories(cmTarget const* target, |