1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Rename _qt_internal_find_dependencies to something less generic

Browse Source 
Pick-to: 6.4
Task-number: QTBUG-104998
Change-Id: I99b69865f711ff57511f32df2f345cebb7445d44
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2022-07-13 19:22:37 +02:00
parent 7853f80e39
commit 4c0578253d
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtModuleDependencies.cmake.in
View File

@ -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" # note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0"
set(__qt_@target@_target_deps "@target_deps@") set(__qt_@target@_target_deps "@target_deps@")
set(__qt_@target@_find_dependency_paths "${CMAKE_CURRENT_LIST_DIR}/.." "${_qt_cmake_dir}") 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(_@QT_CMAKE_EXPORT_NAMESPACE@@target@_MODULE_DEPENDENCIES "@qt_module_dependencies@")
set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND TRUE) set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND TRUE)

2
cmake/QtPluginDependencies.cmake.in
View File

@ -12,6 +12,6 @@ endif()
# note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0" # note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0"
set(__qt_@target@_target_deps "@target_deps@") set(__qt_@target@_target_deps "@target_deps@")
set(__qt_@target@_find_dependency_paths "@find_dependency_paths@") 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) set(@target@_FOUND TRUE)

11
cmake/QtPublicDependencyHelpers.cmake
View File

@ -80,7 +80,7 @@ endmacro()
# Please note the target_dep_list accepts not the actual list values but the list names that # 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. # contain preformed dependencies. See foreach block for reference.
# The same applies for find_dependency_path_list. # 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}) foreach(__qt_target_dep IN LISTS ${target_dep_list})
list(GET __qt_target_dep 0 __qt_pkg) list(GET __qt_target_dep 0 __qt_pkg)
list(GET __qt_target_dep 1 __qt_version) 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() endif()
endforeach() endforeach()
endmacro() 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()