diff options
| author | Li Xinwei <1326710505@qq.com> | 2021-07-23 15:37:14 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-23 21:21:39 +0000 |
| commit | 23a20fb293c5b3276a6aca77d77a886f3414548d (patch) | |
| tree | 4ce25997ded18b9436c42418ccc32ffe78164690 /cmake/QtPublicDependencyHelpers.cmake | |
| parent | b47df246f64c70bc19ecb3f612a9d884c548532e (diff) | |
CMake: Use namespaced variables in Qt6*Dependencies.cmake
Change-Id: I166988020cfd9750a4d58e519742215d0c03ad3e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit bd594f945773f713ca493fd7b040fde8a12bdf87)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake/QtPublicDependencyHelpers.cmake')
| -rw-r--r-- | cmake/QtPublicDependencyHelpers.cmake | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cmake/QtPublicDependencyHelpers.cmake b/cmake/QtPublicDependencyHelpers.cmake index e5e41b92af..84c9e8be92 100644 --- a/cmake/QtPublicDependencyHelpers.cmake +++ b/cmake/QtPublicDependencyHelpers.cmake @@ -2,18 +2,18 @@ # 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) - foreach(target_dep IN LISTS ${target_dep_list}) - list(GET target_dep 0 pkg) - list(GET target_dep 1 version) + 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) - if (NOT ${pkg}_FOUND) - set(pkg_names ${pkg}) - if(pkg MATCHES "(.*)Private$") - set(pkg_names "${CMAKE_MATCH_1};${pkg}") + if (NOT ${__qt_pkg}_FOUND) + set(__qt_pkg_names ${__qt_pkg}) + if(__qt_pkg MATCHES "(.*)Private$") + set(__qt_pkg_names "${CMAKE_MATCH_1};${__qt_pkg}") endif() - find_dependency(${pkg} ${version} + find_dependency(${__qt_pkg} ${__qt_version} NAMES - ${pkg_names} + ${__qt_pkg_names} PATHS ${${find_dependency_path_list}} ${_qt_additional_packages_prefix_path} |