From 830c4041befb6897c33d972c8eeb7231dfe24f74 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 27 Nov 2023 09:03:44 +0100 Subject: [PATCH] CMake: Create wrapper scripts after global feature evaluation Otherwise we don't have access to the 'debug' and 'debug_and_release' features to decide whether the install script needs to strip binaries or not. Amends 09fdddeb326d0c79d080bdb50a92a839038baea7 Pick-to: 6.6 Fixes: QTBUG-118070 Change-Id: I4f1b8463fa369edd38c1110d1d69e7fa7a45de63 Reviewed-by: Amir Masoud Abdol --- cmake/QtBaseGlobalTargets.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index 0086f9b5b8e..032f3f7b307 100644 --- a/cmake/QtBaseGlobalTargets.cmake +++ b/cmake/QtBaseGlobalTargets.cmake @@ -65,8 +65,6 @@ set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS qt_internal_create_toolchain_file() -qt_internal_create_wrapper_scripts() - ## Library to hold global features: ## These features are stored and accessed via Qt::GlobalConfig, but the ## files always lived in Qt::Core, so we keep it that way @@ -120,6 +118,9 @@ qt_generate_global_module_pri_file() qt_generate_global_device_pri_file() qt_generate_qmake_and_qtpaths_wrapper_for_target() +# Depends on the global features being evaluated. +qt_internal_create_wrapper_scripts() + add_library(Qt::GlobalConfig ALIAS GlobalConfig) add_library(GlobalConfigPrivate INTERFACE)