From b705021b4eaed1e61d39dc481fd5373722c6f460 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 14 Jan 2019 11:01:06 +0100 Subject: [PATCH] CMake: Check for visibility once Change-Id: I5c729f4509eed16409df5eb048afb7f60c5ca57c Reviewed-by: Tobias Hunger --- cmake/QtFeature.cmake | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake index 039412fd6f..380626b35a 100644 --- a/cmake/QtFeature.cmake +++ b/cmake/QtFeature.cmake @@ -412,12 +412,13 @@ function(qt_pull_features_into_current_scope) else() set(property_prefix "") endif() - foreach(visibility PUBLIC PRIVATE) + foreach(visibility IN ITEMS PUBLIC PRIVATE) + if(NOT ${arg_${visibility}_FEATURES}) + continue() + endif() + set(value ON) - foreach(state ENABLED DISABLED) - if(NOT ${arg_${visibility}_FEATURES}) - continue() - endif() + foreach(state IN ITEMS ENABLED DISABLED) get_target_property(features "${target}" ${property_prefix}QT_${arg_FEATURE_PROPERTY_INFIX}${state}_${visibility}_FEATURES) if("${features}" STREQUAL "features-NOTFOUND") continue()