diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-20 14:55:47 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-09-26 17:32:53 (GMT) |
| commit | 8b6ec29d4096b4ea59ef502360845e25a9bcb47e (patch) | |
| tree | 7c1cb936426d9778397fa16df02c47310db4d12e /Source | |
| parent | 9470b056fc0be0910f90230e0635d4a2e2baa81a (diff) | |
| download | CMake-8b6ec29d4096b4ea59ef502360845e25a9bcb47e.zip CMake-8b6ec29d4096b4ea59ef502360845e25a9bcb47e.tar.gz CMake-8b6ec29d4096b4ea59ef502360845e25a9bcb47e.tar.bz2 | |
QtAutogen: Move initialization condition to caller.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 22 | ||||
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 14 | ||||
| -rw-r--r-- | Source/cmQtAutoGenerators.h | 2 |
3 files changed, 18 insertions, 20 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index f9a65ee..435b769 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1436,6 +1436,18 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens) { continue; } + // don't do anything if there is no Qt4 or Qt5Core (which contains moc): + cmMakefile* mf = ti->second.GetMakefile(); + std::string qtMajorVersion = mf->GetSafeDefinition("QT_VERSION_MAJOR"); + if (qtMajorVersion == "") + { + qtMajorVersion = mf->GetSafeDefinition("Qt5Core_VERSION_MAJOR"); + } + if (qtMajorVersion != "4" && qtMajorVersion != "5") + { + continue; + } + targetNames.push_back(ti->second.GetName()); } for(std::vector<std::string>::iterator ti = targetNames.begin(); @@ -1444,12 +1456,10 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens) cmTarget& target = *this->LocalGenerators[i] ->GetMakefile()->FindTarget(*ti, true); - if(cmQtAutoGenerators::InitializeAutogenTarget( - this->LocalGenerators[i], &target)) - { - cmQtAutoGenerators autogen; - autogens.push_back(std::make_pair(autogen, &target)); - } + cmQtAutoGenerators::InitializeAutogenTarget( + this->LocalGenerators[i], &target); + cmQtAutoGenerators autogen; + autogens.push_back(std::make_pair(autogen, &target)); } } #else diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 6fee69e..04d7bbc 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, diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index 02b6fdf..ff048c8 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -31,7 +31,7 @@ public: cmQtAutoGenerators(); bool Run(const std::string& targetDirectory, const std::string& config); - static bool InitializeAutogenTarget(cmLocalGenerator* lg, cmTarget* target); + static void InitializeAutogenTarget(cmLocalGenerator* lg, cmTarget* target); static void SetupAutoGenerateTarget(cmTarget const* target); private: |