diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-17 22:01:09 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-19 06:28:10 +0100 |
commit | e0d709d8d3535a897de359eb9a0f33867b5ae040 (patch) | |
tree | 537cc43a4934dfe5a6ea209995b16236b347b899 /cmake/QtPostProcessHelpers.cmake | |
parent | d41eed01a4b2444cc68f6d482ff76a70c9abbc58 (diff) |
CMake: Fix missing dependencies in *Depends headers
In qt_internal_create_module_depends_file we're checking the target
property INTERFACE_MODULE_HAS_HEADERS. However, this property is not
exported, and in per-repo builds we do not have access to this.
As we cannot export INTERFACE_* properties, we export another one,
called _qt_module_has_headers.
This amends commit 598e873c84e6544aa67495b9b9fb1ff22f98a293.
Fixes: QTBUG-88503
Change-Id: I04b3e24add6e95b577a049c80683b7361ff72f59
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtPostProcessHelpers.cmake')
-rw-r--r-- | cmake/QtPostProcessHelpers.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake index 597e59be07..09a5b96479 100644 --- a/cmake/QtPostProcessHelpers.cmake +++ b/cmake/QtPostProcessHelpers.cmake @@ -139,7 +139,13 @@ function(qt_internal_create_module_depends_file target) continue() endif() else() - get_target_property(module_has_headers Qt::${dep} INTERFACE_MODULE_HAS_HEADERS) + get_target_property(is_versionless_target Qt::${dep} _qt_is_versionless_target) + if(is_versionless_target) + get_target_property(module_has_headers ${QT_CMAKE_EXPORT_NAMESPACE}::${dep} + _qt_module_has_headers) + else() + get_target_property(module_has_headers Qt::${dep} _qt_module_has_headers) + endif() if (NOT module_has_headers) continue() endif() |