f881e06dd4
Tool dependencies that are added using the qt_record_extra_package_dependency function now are considered as the third party dependencies. This allows using two different approaches when looking for the dependencies of Qt tools. All dependencies that are Qt tools now go to the path invented in 035fbd068b5a3fbc18b7868ecac9a6a6a2f6602c and use the _qt_internal_find_tool_dependencies function which is designed to look for Qt packages and uses CONFIG signature of find_package. To look for the non-Qt modules we should use more generic find_package signature and _qt_internal_find_third_party_dependencies fits perfecly for these purpose. Note that it's known issue that the _qt_internal_find_third_party_dependencies command also may find "target" tools when crosscompiling, but this commmit doesn't reinvent it. We already have various places which make the scoped "host" dependencies lookups to ensure that "host" tools look for the "host" dependencies in build systems like yocto. Ammends 035fbd068b5a3fbc18b7868ecac9a6a6a2f6602c Task-number: QTBUG-132340 Fixes: QTBUG-132622 Fixes: QTBUG-132616 Pick-to: 6.5 6.8 6.9 Change-Id: I9effba3d405ceec720a8a2a332250619cd56f598 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
12 lines
478 B
CMake
12 lines
478 B
CMake
# Copyright (C) 2024 The Qt Company Ltd.
|
|
# SPDX-License-Identifier: BSD-3-Clause
|
|
|
|
# Find "ModuleTools" dependencies, which are other ModuleTools packages.
|
|
set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND TRUE)
|
|
|
|
set(__qt_@target@_tool_third_party_deps "@third_party_deps@")
|
|
_qt_internal_find_third_party_dependencies("@target@" __qt_@target@_tool_third_party_deps)
|
|
|
|
set(__qt_@target@_tool_deps "@package_deps@")
|
|
_qt_internal_find_tool_dependencies("@target@" __qt_@target@_tool_deps)
|