diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-11-10 15:15:09 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-11-11 16:34:50 +0100 |
| commit | a299f337c5680dbfbf9756b54daf82271423d06e (patch) | |
| tree | dbcce75971937a05868dea395d0bc8169e15d569 /cmake/QtPostProcessHelpers.cmake | |
| parent | da7609e7d0592b76ccb7cfb6c3136267172dc6bf (diff) | |
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 <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtPostProcessHelpers.cmake')
| -rw-r--r-- | cmake/QtPostProcessHelpers.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
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") |