diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-03-19 11:48:13 +1100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-22 01:43:48 +0000 |
| commit | ef2ed2e7c8a87a66838bb2526c9bf12795a896ca (patch) | |
| tree | 55d7b117bc49fada161152fc9bb9e9057f4bedec /cmake | |
| parent | 38d4008458db7f2d192a5b4b1d43b1962ceca887 (diff) | |
Remove unnecessary $<BOOL:...> generator expression
The $<NOT:...> genex already guarantees to return a value of 0 or 1,
so there's no need to wrap it with $<BOOL:...>.
Change-Id: Iff4ad64ed8deaa846e1b5bc22d2e5d9dbcd77cc7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit df121fd7f74ecfb3de20867edea1c1f3ebf035c2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtPlugins.cmake.in | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cmake/QtPlugins.cmake.in b/cmake/QtPlugins.cmake.in index c901f8c47d..0014a7358c 100644 --- a/cmake/QtPlugins.cmake.in +++ b/cmake/QtPlugins.cmake.in @@ -13,9 +13,6 @@ if(NOT @BUILD_SHARED_LIBS@) unset(_aliased_target) set(_default_plugins_are_enabled "$<NOT:$<STREQUAL:$<GENEX_EVAL:$<TARGET_PROPERTY:QT_DEFAULT_PLUGINS>>,0>>") - # Make sure to boolify the result of the expression, in case if the returned property value - # is empty. - set(_default_plugins_are_enabled_wrapped "$<BOOL:${_default_plugins_are_enabled}>") set(_manual_plugins_genex "$<GENEX_EVAL:$<TARGET_PROPERTY:QT_PLUGINS>>") set(_no_plugins_genex "$<GENEX_EVAL:$<TARGET_PROPERTY:QT_NO_PLUGINS>>") @@ -105,7 +102,7 @@ if(NOT @BUILD_SHARED_LIBS@) "${_plugin_is_in_type_whitelist}," "${_plugin_versionless_is_in_type_whitelist}," "$<AND:" - "${_default_plugins_are_enabled_wrapped}," + "${_default_plugins_are_enabled}," "${_plugin_is_default}," "${_plugin_is_not_blacklisted}" ">" |