diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-11-03 10:44:38 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-11-03 20:02:54 +0000 |
| commit | 2def195b603f64eab2e3ea5ad5a7598e43ae13d5 (patch) | |
| tree | 58bd560778a7a428d96ae21050bc70f9f3f9efa5 /cmake | |
| parent | 1c8fe484b72bd2627c65e0e54fd0ec223a55243a (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.
Change-Id: I2878fa6b8d4b11677c3f48345bf6e239221074c2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 63acb0d9fee6b5d985cd424d2e6283484db057ee)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to '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 54555f24de..c6bf6f9011 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -736,10 +736,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}") @@ -762,6 +758,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() |