From 4f26758978e84f959a28d90b2ff336bae32a2d3f Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 10 Jan 2019 10:50:38 +0100 Subject: CMake: Introduce Qt::GlobalConfig to hold the global features This simplifies the handling of features a bit as it removes the special code to store two sets of features in Qt::Core. Change-Id: I536d41cfc76a02af054e3cfbad6bda50b1e9e49a Reviewed-by: Simon Hausmann --- cmake/QtBuild.cmake | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'cmake/QtBuild.cmake') diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 446746c011..d35254c48f 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -272,11 +272,6 @@ function(extend_target target) list(APPEND dbus_sources "${sources}") endforeach() - # Import features - if(NOT "${target}" STREQUAL "Core") - qt_pull_features_into_current_scope(PUBLIC_FEATURES PRIVATE_FEATURES FEATURE_PROPERTY_INFIX "GLOBAL_" Qt::Core) - endif() - foreach(dep ${arg_FEATURE_DEPENDENCIES} ${arg_LIBRARIES} ${arg_PUBLIC_LIBRARIES}) if("${dep}" MATCHES "^Qt::((.+)(Private)|(.+))$") if (${CMAKE_MATCH_COUNT} EQUAL 3) @@ -292,9 +287,9 @@ function(extend_target target) endif() if("x${CMAKE_MATCH_3}" STREQUAL "xPrivate") - qt_pull_features_into_current_scope(PRIVATE_FEATURES ${depTarget}) + qt_pull_features_into_current_scope(PRIVATE_FEATURES "Qt::${depTarget}") endif() - qt_pull_features_into_current_scope(PUBLIC_FEATURES ${depTarget}) + qt_pull_features_into_current_scope(PUBLIC_FEATURES "Qt::${depTarget}") endif() endforeach() -- cgit v1.2.3