summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2024-04-05 14:17:58 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-05-07 17:23:10 +0000
commit21b2ce455c9bb57eaa4f38e6735ebaf9890b01fb (patch)
tree3bba3d7861d300587bd9fee681266828589c3cc2 /cmake
parent062f701a11d2c46660f5c5edd73f245477918a47 (diff)
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 <alexandru.croitor@qt.io> (cherry picked from commit 721cfbd1942f8148dd464c0542b0d4c1191b53f9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtPublicWalkLibsHelpers.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtPublicWalkLibsHelpers.cmake b/cmake/QtPublicWalkLibsHelpers.cmake
index f79b70c710..1d98dd6e58 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$")