From 697b76936047ba9d83f7d918bbf79b8d170513b7 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 6 Jan 2025 18:25:38 +0100 Subject: [PATCH] Small _qt_internal_find_tool_dependencies optimization bit Set __qt_${target}_find_package_args once per the _qt_internal_find_tool_dependencies call. It doesn't make sense to call set it in loop, since variable doesn't depend on loop parameters. Pick-to: 6.8 6.5 Change-Id: Ia1024625b870364a1db8e07f61bf7ea6ab4e9f84 Reviewed-by: Joerg Bornemann Reviewed-by: Alexandru Croitor (cherry picked from commit 80932ed80b5ec809b42be63c8f719290da56f288) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtPublicDependencyHelpers.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/QtPublicDependencyHelpers.cmake b/cmake/QtPublicDependencyHelpers.cmake index feeec07fff8..1c3535cb47b 100644 --- a/cmake/QtPublicDependencyHelpers.cmake +++ b/cmake/QtPublicDependencyHelpers.cmake @@ -86,15 +86,15 @@ macro(_qt_internal_find_tool_dependencies target target_dep_list) "${_qt_additional_host_packages_root_paths}") endif() + unset(__qt_${target}_find_package_args) + if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY) + list(APPEND __qt_${target}_find_package_args QUIET) + endif() + foreach(__qt_${target}_target_dep IN LISTS ${target_dep_list}) list(GET __qt_${target}_target_dep 0 __qt_${target}_pkg) list(GET __qt_${target}_target_dep 1 __qt_${target}_version) - unset(__qt_${target}_find_package_args) - if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY) - list(APPEND __qt_${target}_find_package_args QUIET) - endif() - _qt_internal_save_find_package_context_for_debugging(${target}) find_package(${__qt_${target}_pkg}