From 5ec937115bc677a75525dfa9147c1763adbea50e Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 16 Jun 2021 17:56:07 +0200 Subject: [PATCH] CMake: Export info if an object lib target is a plugin initializer Needed for qtdeclarative so we can filter out which object library should go into which export set, because qt_internal_add_qml_module can create both a backing library export set and a plugin export set. The plugin initializer object lib should go to the plugin export set. Pick-to: 6.2 Task-number: QTBUG-92933 Change-Id: I0fce131eff75a0b3090ac0fbb2a12ecfcba5e38d Reviewed-by: Joerg Bornemann --- cmake/QtPublicPluginHelpers.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/QtPublicPluginHelpers.cmake b/cmake/QtPublicPluginHelpers.cmake index ce8ddf0bee2..919aee10c69 100644 --- a/cmake/QtPublicPluginHelpers.cmake +++ b/cmake/QtPublicPluginHelpers.cmake @@ -244,6 +244,11 @@ function(__qt_internal_add_static_plugin_init_object_library ${QT_CMAKE_EXPORT_NAMESPACE}::Core ) + set_property(TARGET ${plugin_init_target} PROPERTY _is_qt_plugin_init_target TRUE) + set_property(TARGET ${plugin_init_target} APPEND PROPERTY + EXPORT_PROPERTIES _is_qt_plugin_init_target + ) + set(${out_var_plugin_init_target} "${plugin_init_target}" PARENT_SCOPE) endfunction()