summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2019-01-14 11:01:06 +0100
committerTobias Hunger <tobias.hunger@qt.io>2019-01-16 11:07:23 +0000
commitb705021b4eaed1e61d39dc481fd5373722c6f460 (patch)
tree48ea92412d5f7f99eff183da4a7c3859cfdcfad4 /cmake
parent3552323049f54f2ddd8cb9f8f35c1e34c18d1e51 (diff)
CMake: Check for visibility once
Change-Id: I5c729f4509eed16409df5eb048afb7f60c5ca57c Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtFeature.cmake11
1 files 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()