diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-12 11:39:02 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-11-12 14:25:06 +0000 |
| commit | 2d07ef0b566fb60dcb320a574ef282dbcd2329e3 (patch) | |
| tree | 71ce3d256efd5b7982533a10bc70da6454c19a77 /cmake | |
| parent | d312580a0539266bfd134bea50090d211eee6e1f (diff) | |
CMake: Fix Core -> Core dependency in static build
Fix the overly strict regex in qt_internal_create_module_depends_file to
allow for - and _ in module names.
We had the above mentioned dependency cycle, because the module name
Core_qobject was translated to just Core, creating a Core -> Core
dependency.
Amends da7609e7d0592b76ccb7cfb6c3136267172dc6bf.
Fixes: QTBUG-88437
Change-Id: I866f7ce31e9a1b92fe4c0a6450295c2f3c761558
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtPostProcessHelpers.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake index 655739e80c..597e59be07 100644 --- a/cmake/QtPostProcessHelpers.cmake +++ b/cmake/QtPostProcessHelpers.cmake @@ -129,7 +129,7 @@ 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|${QT_CMAKE_EXPORT_NAMESPACE})::([A-Za-z0-9]+)") + 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) |