From 4c0578253d0dbc7c372e7839dbb4050fd61bf012 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 13 Jul 2022 19:22:37 +0200 Subject: [PATCH] CMake: Rename _qt_internal_find_dependencies to something less generic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick-to: 6.4 Task-number: QTBUG-104998 Change-Id: I99b69865f711ff57511f32df2f345cebb7445d44 Reviewed-by: Jörg Bornemann --- cmake/QtModuleDependencies.cmake.in | 2 +- cmake/QtPluginDependencies.cmake.in | 2 +- cmake/QtPublicDependencyHelpers.cmake | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/cmake/QtModuleDependencies.cmake.in b/cmake/QtModuleDependencies.cmake.in index 44755793ff1..f48fe81fd1f 100644 --- a/cmake/QtModuleDependencies.cmake.in +++ b/cmake/QtModuleDependencies.cmake.in @@ -29,7 +29,7 @@ _qt_internal_find_tool_dependencies("@target@" __qt_@target@_tool_deps) # note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0" set(__qt_@target@_target_deps "@target_deps@") set(__qt_@target@_find_dependency_paths "${CMAKE_CURRENT_LIST_DIR}/.." "${_qt_cmake_dir}") -_qt_internal_find_dependencies(__qt_@target@_target_deps __qt_@target@_find_dependency_paths) +_qt_internal_find_qt_dependencies(__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) diff --git a/cmake/QtPluginDependencies.cmake.in b/cmake/QtPluginDependencies.cmake.in index a86731da572..a3ae1215ab8 100644 --- a/cmake/QtPluginDependencies.cmake.in +++ b/cmake/QtPluginDependencies.cmake.in @@ -12,6 +12,6 @@ endif() # note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0" set(__qt_@target@_target_deps "@target_deps@") set(__qt_@target@_find_dependency_paths "@find_dependency_paths@") -_qt_internal_find_dependencies(__qt_@target@_target_deps __qt_@target@_find_dependency_paths) +_qt_internal_find_qt_dependencies(__qt_@target@_target_deps __qt_@target@_find_dependency_paths) set(@target@_FOUND TRUE) diff --git a/cmake/QtPublicDependencyHelpers.cmake b/cmake/QtPublicDependencyHelpers.cmake index eb41ff1e230..09242376361 100644 --- a/cmake/QtPublicDependencyHelpers.cmake +++ b/cmake/QtPublicDependencyHelpers.cmake @@ -80,7 +80,7 @@ endmacro() # Please note the target_dep_list accepts not the actual list values but the list names that # contain preformed dependencies. See foreach block for reference. # The same applies for find_dependency_path_list. -macro(_qt_internal_find_dependencies target_dep_list find_dependency_path_list) +macro(_qt_internal_find_qt_dependencies target_dep_list find_dependency_path_list) foreach(__qt_target_dep IN LISTS ${target_dep_list}) list(GET __qt_target_dep 0 __qt_pkg) list(GET __qt_target_dep 1 __qt_version) @@ -102,3 +102,12 @@ macro(_qt_internal_find_dependencies target_dep_list find_dependency_path_list) endif() endforeach() endmacro() + + +# TODO: Remove once a dependency update completes and most developers have the Dependencies.cmake +# files updated in their builds. +# The name is too generic, it doesn't look for any kind of dependencies but only Qt package +# dependencies. +macro(_qt_internal_find_dependencies target_dep_list find_dependency_path_list) + _qt_internal_find_qt_dependencies("${target_dep_list}" "${find_dependency_path_list}") +endmacro()