Skip to content

Commit

Permalink
Remove unnecessary $<BOOL:...> generator expression
Browse files Browse the repository at this point in the history
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 <[email protected]>
(cherry picked from commit df121fd)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
  • Loading branch information
Craig Scott authored and Qt Cherry-pick Bot committed Mar 22, 2021
1 parent 25fe2c1 commit cade43c
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions cmake/QtPlugins.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ function(__qt_internal_add_static_plugins_once)
endif()

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>>")

Expand Down Expand Up @@ -125,7 +122,7 @@ function(__qt_internal_add_static_plugins_once)
"${_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}"
">"
Expand Down

0 comments on commit cade43c

Please sign in to comment.