diff options
| author | Alexey Edelev <[email protected]> | 2023-10-23 15:47:07 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <[email protected]> | 2023-10-24 17:18:12 +0000 |
| commit | e5c7bb62eef98df40b3d2534b47a1d1ab26e7c38 (patch) | |
| tree | eae94e45fdc05f4d1e83b62f68f836d9f7ac8152 | |
| parent | a61d7529511c890aa595110b9320ea0bf53dd623 (diff) | |
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 6.6
Change-Id: If80e61394f245f09b620a9210246053d4e475f86
Reviewed-by: Joerg Bornemann <[email protected]>
| -rw-r--r-- | cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index c34b4e83991..337c140cd37 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() |