From 23c1b520bd09d37a15515820a48bf9b01dcc4b86 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 23 Oct 2023 15:47:07 +0200 Subject: [PATCH] Fix the dependency list naming when collecting repo dependencies The 'dependencies.yaml' file contains entries that aligned with the repository naming but not the Qt projects naming. When parsing it to collect the dependencies for the standalone repo we should cut the 'tqtc-' repo prefix to avoid malformed names in QT_REPO_DEPENDENCIES variable. Pick-to: 6.5 Change-Id: If80e61394f245f09b620a9210246053d4e475f86 Reviewed-by: Joerg Bornemann (cherry picked from commit e5c7bb62eef98df40b3d2534b47a1d1ab26e7c38) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index c9b9d317e59..88e64970a83 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -39,6 +39,9 @@ function(qt_internal_read_repo_dependencies out_var repo_dir) if(NOT dependency IN_LIST seen) qt_internal_read_repo_dependencies(subdeps "${dependency_repo_dir}" ${seen} ${dependency}) + if(dependency MATCHES "^tqtc-(.+)") + set(dependency "${CMAKE_MATCH_1}") + endif() list(APPEND dependencies ${subdeps} ${dependency}) endif() endif()