From 5e4f4816a89673a2501abc458b28365bcf103c47 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 7 Mar 2023 14:23:29 +0100 Subject: [PATCH] Make sure that all dependencies are found before creating tool targets The result of dependency lookup is not taken into account when evaluating tool packages. Check for _FOUND before creating the tool targets that belong to the tool package. Adjust the tool package lookup that the dependencies always affect the lookup result even if we avoided creating targets by setting QT_NO_CREATE_TARGETS. Pick-to: 6.5 6.5.0 Change-Id: Ia95c9c71370becc639ed8a9db026aed2f93959b4 Reviewed-by: Alexandru Croitor --- cmake/QtModuleToolsConfig.cmake.in | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/cmake/QtModuleToolsConfig.cmake.in b/cmake/QtModuleToolsConfig.cmake.in index fdbc853646..4d852dc98e 100644 --- a/cmake/QtModuleToolsConfig.cmake.in +++ b/cmake/QtModuleToolsConfig.cmake.in @@ -4,12 +4,18 @@ cmake_minimum_required(VERSION @min_new_policy_version@...@max_new_policy_versio include(CMakeFindDependencyMacro) -if (NOT QT_NO_CREATE_TARGETS) - # Find required dependencies, if any. - if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Dependencies.cmake") - include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Dependencies.cmake") - endif() +# Find required dependencies, if any. +if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Dependencies.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Dependencies.cmake") +endif() +# If *Dependencies.cmake exists, the variable value will be defined there. +# Don't override it in that case. +if(NOT DEFINED "@INSTALL_CMAKE_NAMESPACE@@target@_FOUND") + set("@INSTALL_CMAKE_NAMESPACE@@target@_FOUND" TRUE) +endif() + +if (NOT QT_NO_CREATE_TARGETS AND @INSTALL_CMAKE_NAMESPACE@@target@_FOUND) include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Targets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@AdditionalTargetInfo.cmake") if(NOT QT_NO_CREATE_VERSIONLESS_TARGETS)