From a299f337c5680dbfbf9756b54daf82271423d06e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 10 Nov 2020 15:15:09 +0100 Subject: cmake: Handle exported namespace when computing deps We need to handle the possibility of versioned dep (Qt6::Foo). Change-Id: I66797dbc59f00500892958e9c99c4555cddcb980 Reviewed-by: Alexandru Croitor --- cmake/QtPostProcessHelpers.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmake') diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake index 52858af28c..655739e80c 100644 --- a/cmake/QtPostProcessHelpers.cmake +++ b/cmake/QtPostProcessHelpers.cmake @@ -129,8 +129,8 @@ function(qt_internal_create_module_depends_file target) set(all_depends ${depends} ${public_depends}) foreach (dep ${all_depends}) # Normalize module by stripping leading "Qt::" and trailing "Private" - if (dep MATCHES "Qt::([A-Za-z0-9]+)") - set(dep "${CMAKE_MATCH_1}") + if (dep MATCHES "(Qt|${QT_CMAKE_EXPORT_NAMESPACE})::([A-Za-z0-9]+)") + set(dep "${CMAKE_MATCH_2}") if (TARGET Qt::${dep}) get_target_property(dep_type Qt::${dep} TYPE) if (NOT dep_type STREQUAL "INTERFACE_LIBRARY") -- cgit v1.2.3