diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-09-07 19:42:49 +0200 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@qt.io> | 2021-09-10 15:19:48 +0000 |
| commit | 887f2d5451efffde1a9f80733ea435088e6c1888 (patch) | |
| tree | e244b90e85658eb9cc5cd6f37f1341a1b88bdfdd | |
| parent | a73f503247ec0490e2cb71ac56e80b29d696b6a7 (diff) | |
Avoid implicit linking of plugin init library if finalizers were called
Propagating of plugin init libraries should take into account
plugin finalizers to avoid duplicating of object files in a linker
line.
Fixes: QTBUG-96062
Change-Id: I48feac94b08a7eb08d84134e9e9ae6e7214f5bdd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 7e794d71c0bf0f6e812aa1c7794b709889f202fd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 2ad29c0a3ae1252c6c30eaca2aa06c131a67f819)
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
| -rw-r--r-- | cmake/QtPublicPluginHelpers.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/QtPublicPluginHelpers.cmake b/cmake/QtPublicPluginHelpers.cmake index cbe8a5c8aa..a5b1125e4f 100644 --- a/cmake/QtPublicPluginHelpers.cmake +++ b/cmake/QtPublicPluginHelpers.cmake @@ -198,6 +198,8 @@ function(__qt_internal_add_static_plugin_import_macro __qt_internal_propagate_object_library( "${QT_CMAKE_EXPORT_NAMESPACE}::${plugin_target}" "${plugin_init_target_namespaced}" + EXTRA_CONDITIONS + "$<NOT:$<BOOL:$<TARGET_PROPERTY:_qt_static_plugins_finalizer_mode>>>" ) endfunction() |