From 21b2ce455c9bb57eaa4f38e6735ebaf9890b01fb Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 5 Apr 2024 14:17:58 +0200 Subject: [PATCH] Consider versioned targets when checking the existens in __qt_internal_walk_libs Since Qt targets now are linked as versioned targets by default, we should adjust the respective check in __qt_internal_walk_libs. Change-Id: Idb896c1d9eda944a06d57b0491686cd78e010df0 Reviewed-by: Alexandru Croitor (cherry picked from commit 721cfbd1942f8148dd464c0542b0d4c1191b53f9) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtPublicWalkLibsHelpers.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/QtPublicWalkLibsHelpers.cmake b/cmake/QtPublicWalkLibsHelpers.cmake index f79b70c710f..1d98dd6e58e 100644 --- a/cmake/QtPublicWalkLibsHelpers.cmake +++ b/cmake/QtPublicWalkLibsHelpers.cmake @@ -255,8 +255,8 @@ function(__qt_internal_walk_libs __qt_internal_promote_target_to_global(${lib_target_unaliased}) endif() endif() - elseif("${lib_target}" MATCHES "^Qt::(.*)") - message(FATAL_ERROR "The ${CMAKE_MATCH_1} target is mentioned as a dependency for \ + elseif("${lib_target}" MATCHES "^(Qt|${QT_CMAKE_EXPORT_NAMESPACE})::(.*)") + message(FATAL_ERROR "The ${CMAKE_MATCH_2} target is mentioned as a dependency for \ ${target}, but not declared.") else() if(NOT operation MATCHES "^(collect|direct)_targets$")