diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-11-03 10:44:38 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-11-03 21:02:44 +0100 |
| commit | 63acb0d9fee6b5d985cd424d2e6283484db057ee (patch) | |
| tree | 9550eb7d9dfbc28f1d6ab7e7f8d43b19a7a4e94e /cmake/QtModuleHelpers.cmake | |
| parent | 2d39509d4a47e4f39180147ba5018923000f654e (diff) | |
Move qt_finalize_framework_headers_copy to the scope finalizer
The qt_finalize_framework_headers_copy function uses the module
QT_COPIED_FRAMEWORK_HEADERS property to generate the dependency list
for the ${target}_framework_headers target. In a common case elements
can be added to the QT_COPIED_FRAMEWORK_HEADERS property after the
qt_internal_add_module command call, that's why we need to make sure
that qt_finalize_framework_headers_copy is called after collecting all
headers assigned to the module.
Pick-to: 6.2
Change-Id: I2878fa6b8d4b11677c3f48345bf6e239221074c2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtModuleHelpers.cmake')
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 85ee910c9d..02300ed43d 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -761,10 +761,6 @@ set(QT_LIBINFIX \"${QT_LIBINFIX}\")") target_link_libraries("${target_private}" INTERFACE "${target}") endif() - if(is_framework AND NOT is_interface_lib) - qt_finalize_framework_headers_copy(${target}) - endif() - set(debug_install_dir "${INSTALL_LIBDIR}") if (MINGW) set(debug_install_dir "${INSTALL_BINDIR}") @@ -787,6 +783,7 @@ set(QT_LIBINFIX \"${QT_LIBINFIX}\")") endfunction() function(qt_finalize_module target) + qt_finalize_framework_headers_copy(${target}) qt_generate_prl_file(${target} "${INSTALL_LIBDIR}") qt_generate_module_pri_file("${target}" ${ARGN}) endfunction() |