1 files changed, 29 insertions, 80 deletions
diff --git a/cmake/QtModuleDependencies.cmake.in b/cmake/QtModuleDependencies.cmake.in
index 01cf9d5b3c..ba5922d1e2 100644
--- a/cmake/QtModuleDependencies.cmake.in
+++ b/cmake/QtModuleDependencies.cmake.in
@@ -1,97 +1,46 @@
+# Copyright (C) 2024 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 # Make sure @INSTALL_CMAKE_NAMESPACE@ is found before anything else.
 set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND FALSE)
 
+if("${_qt_cmake_dir}" STREQUAL "")
+    set(_qt_cmake_dir "${QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR}")
+endif()
 set(__qt_use_no_default_path_for_qt_packages "NO_DEFAULT_PATH")
 if(QT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES)
     set(__qt_use_no_default_path_for_qt_packages "")
 endif()
-find_dependency(@INSTALL_CMAKE_NAMESPACE@ @PROJECT_VERSION@
-    PATHS
-        "${CMAKE_CURRENT_LIST_DIR}/.."
-        ${QT_ADDITIONAL_PACKAGES_PREFIX_PATH}
-        ${QT_EXAMPLES_CMAKE_PREFIX_PATH}
-    ${__qt_use_no_default_path_for_qt_packages}
-)
 
-# note: _third_party_deps example: "ICU\\;FALSE\\;1.0\\;i18n uc data;ZLIB\\;FALSE\\;\\;"
-set(_third_party_deps "@third_party_deps@")
+# Don't propagate REQUIRED so we don't immediately FATAL_ERROR, rather let the find_dependency calls
+# set _NOT_FOUND_MESSAGE which will be displayed by the includer of the Dependencies file.
+set(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED FALSE)
+
+if(NOT @INSTALL_CMAKE_NAMESPACE@_FOUND)
+    find_dependency(@INSTALL_CMAKE_NAMESPACE@ @main_qt_package_version@
+        PATHS
+            ${QT_BUILD_CMAKE_PREFIX_PATH}
+            "${CMAKE_CURRENT_LIST_DIR}/.."
+            "${_qt_cmake_dir}"
+            ${_qt_additional_packages_prefix_paths}
+        ${__qt_use_no_default_path_for_qt_packages}
+    )
+endif()
 
-foreach(_target_dep ${_third_party_deps})
-    list(GET _target_dep 0 pkg)
-    list(GET _target_dep 1 is_optional)
-    list(GET _target_dep 2 version)
-    list(GET _target_dep 3 components)
-    set(find_package_args "${pkg}")
-    if(version)
-        list(APPEND find_package_args "${version}")
-    endif()
-    if(components)
-        string(REPLACE " " ";" components "${components}")
-        list(APPEND find_package_args COMPONENTS ${components})
-    endif()
 
-    if(is_optional)
-        if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
-            list(APPEND find_package_args QUIET)
-        endif()
-        find_package(${find_package_args})
-    else()
-        find_dependency(${find_package_args})
-    endif()
-endforeach()
+# note: _third_party_deps example: "ICU\\;FALSE\\;1.0\\;i18n uc data;ZLIB\\;FALSE\\;\\;"
+set(__qt_@target@_third_party_deps "@third_party_deps@")
+_qt_internal_find_third_party_dependencies("@target@" __qt_@target@_third_party_deps)
 
 # Find Qt tool package.
-set(_tool_deps "@main_module_tool_deps@")
-
-if(QT_HOST_PATH)
-     # Make sure that the tools find the host tools first
-     set(BACKUP_@target@_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})
-     set(BACKUP_@target@_CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH})
-     list(PREPEND CMAKE_PREFIX_PATH "${QT_HOST_PATH_CMAKE_DIR}")
-     list(PREPEND CMAKE_FIND_ROOT_PATH "${QT_HOST_PATH}")
-endif()
-
-foreach(_target_dep ${_tool_deps})
-    list(GET _target_dep 0 pkg)
-    list(GET _target_dep 1 version)
-
-    unset(find_package_args)
-    if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
-        list(APPEND find_package_args QUIET)
-    endif()
-    if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
-        list(APPEND find_package_args REQUIRED)
-    endif()
-    find_package(${pkg} ${version} ${find_package_args})
-    if (NOT ${pkg}_FOUND)
-        if(QT_HOST_PATH)
-             set(CMAKE_PREFIX_PATH ${BACKUP_@target@_CMAKE_PREFIX_PATH})
-             set(CMAKE_FIND_ROOT_PATH ${BACKUP_@target@_CMAKE_FIND_ROOT_PATH})
-        endif()
-        return()
-    endif()
-endforeach()
-if(QT_HOST_PATH)
-     set(CMAKE_PREFIX_PATH ${BACKUP_@target@_CMAKE_PREFIX_PATH})
-     set(CMAKE_FIND_ROOT_PATH ${BACKUP_@target@_CMAKE_FIND_ROOT_PATH})
-endif()
+set(__qt_@target@_tool_deps "@main_module_tool_deps@")
+_qt_internal_find_tool_dependencies("@target@" __qt_@target@_tool_deps)
 
 # note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0"
-set(_target_deps "@target_deps@")
-foreach(_target_dep ${_target_deps})
-    list(GET _target_dep 0 pkg)
-    list(GET _target_dep 1 version)
-
-    if (NOT ${pkg}_FOUND)
-        find_dependency(${pkg} ${version}
-            PATHS
-                "${CMAKE_CURRENT_LIST_DIR}/.."
-                ${QT_ADDITIONAL_PACKAGES_PREFIX_PATH}
-                ${QT_EXAMPLES_CMAKE_PREFIX_PATH}
-            ${__qt_use_no_default_path_for_qt_packages}
-        )
-    endif()
-endforeach()
+set(__qt_@target@_target_deps "@target_deps@")
+set(__qt_@target@_find_dependency_paths "${CMAKE_CURRENT_LIST_DIR}/.." "${_qt_cmake_dir}")
+_qt_internal_find_qt_dependencies("@target@" __qt_@target@_target_deps
+                                  __qt_@target@_find_dependency_paths)
 
 set(_@QT_CMAKE_EXPORT_NAMESPACE@@target@_MODULE_DEPENDENCIES "@qt_module_dependencies@")
 set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND TRUE)