From b104bedea171825db06cc257179bb3e05915a159 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 28 Apr 2021 15:25:18 +0200 Subject: CMake: Refactor handling of static plugins Extract common static plugin handling functionality into a separate QtPublicPluginHelpers.cmake file which is loaded by the Qt6 package. Split the code into smaller functions that will be re-used by each templated QtPlugins.cmake.in file, rather than copy pasting the same code into each QtFooPlugins.cmake file. As a drive-by, handle QtFeatures.cmake and QtFeaturesCommon.cmake as public helper files just like QtPublicPluginHelpers.cmake. This makes it clearer that the functions are available outside the internal Qt build and also provides a way for not dumping new helper functions into Qt6CoreMacros.cmake. Task-number: QTBUG-92933 Change-Id: Id816ef009b4fac1cd317d3ef23f21b3530028067 Reviewed-by: Joerg Bornemann --- cmake/QtPlugins.cmake.in | 126 ++++++----------------------------------------- 1 file changed, 16 insertions(+), 110 deletions(-) (limited to 'cmake/QtPlugins.cmake.in') diff --git a/cmake/QtPlugins.cmake.in b/cmake/QtPlugins.cmake.in index 3e554a43ad..3a7b8ab30d 100644 --- a/cmake/QtPlugins.cmake.in +++ b/cmake/QtPlugins.cmake.in @@ -30,123 +30,29 @@ function(__qt_internal_add_static_plugins_once) return() endif() - set(_default_plugins_are_enabled "$>,0>>") - set(_manual_plugins_genex "$>") - set(_no_plugins_genex "$>") - - # Plugin genex marker for prl processing. - set(_is_plugin_marker_genex "$") - - # The code in here uses the properties defined in qt_import_plugins (Qt6CoreMacros.cmake) - foreach(target ${_qt_plugins}) - set(_plugin_target "@INSTALL_CMAKE_NAMESPACE@::${target}") - set(_plugin_target_versionless "Qt::${target}") - get_target_property(_classname "${_plugin_target}" QT_PLUGIN_CLASS_NAME) - if(NOT _classname) - message("Warning: plugin ${_plugin_target} has no class name, skipping.") - continue() + foreach(plugin_target ${_qt_plugins}) + __qt_internal_plugin_get_plugin_type("${plugin_target}" __has_plugin_type __plugin_type) + if(NOT __has_plugin_type) + continue() endif() - get_target_property(_plugin_type "${_plugin_target}" QT_PLUGIN_TYPE) - if(NOT _plugin_type) - message("Warning: plugin ${_plugin_target} has no type ('${_plugin_type}'), skipping.") - continue() + __qt_internal_plugin_has_class_name("${plugin_target}" __has_class_name) + if(NOT __has_class_name) + continue() endif() - list(APPEND "QT_ALL_PLUGINS_FOUND_BY_FIND_PACKAGE_${_plugin_type}" "${target}") - set("QT_ALL_PLUGINS_FOUND_BY_FIND_PACKAGE_${_plugin_type}" - "${QT_ALL_PLUGINS_FOUND_BY_FIND_PACKAGE_${_plugin_type}}" - PARENT_SCOPE - ) - - set(_plugin_is_default "$") - - # INCLUDE - set(_plugin_is_whitelisted "$") - set(_plugin_versionless_is_whitelisted - "$") - - # Note: qt_import_plugins sets the QT_PLUGINS_${_plugin_type} to "-" - # when excluding it with EXCLUDE_BY_TYPE, - # which ensures that no plug-in will be supported unless explicitly re-added afterwards. - string(CONCAT _plugin_is_not_blacklisted - "$" - ">," - "$" - ">," - # Excludes both plugins targeted by EXCLUDE_BY_TYPE and not included in - # INCLUDE_BY_TYPE. - "$>>" - ">" - ) - - # Support INCLUDE_BY_TYPE - string(CONCAT _plugin_is_in_type_whitelist - "$" - ">" - ">" - ) - string(CONCAT _plugin_versionless_is_in_type_whitelist - "$" - ">" - ">" - ) - - # Complete condition that defines whether a static plugin is linked - string(CONCAT _plugin_condition - "$" - ">" - ">>" - ) + list(APPEND "QT_ALL_PLUGINS_FOUND_BY_FIND_PACKAGE_${__plugin_type}" "${plugin_target}") - # If this condition is true, we link against the plug-in - set(_plugin_genex "$<${_plugin_condition}:${_plugin_target}>") - target_link_libraries(${_module_target} INTERFACE "${_plugin_genex}") - - set(_generated_qt_plugin_file_name - "${CMAKE_CURRENT_BINARY_DIR}/qt_@QT_MODULE@_${target}.cpp") - set(_generated_qt_plugin_file_content "#include \nQ_IMPORT_PLUGIN(${_classname})") - - # Generate a source file to import that plug-in. Be careful not to - # update the timestamp of the generated file if we are not going to - # change anything. Otherwise we will trigger CMake's autogen to re-run - # and executables will then need to at least relink. - set(need_write TRUE) - if(EXISTS ${_generated_qt_plugin_file_name}) - file(READ ${_generated_qt_plugin_file_name} old_contents) - if(old_contents STREQUAL "${_generated_qt_plugin_file_content}") - set(need_write FALSE) - endif() - endif() - if(need_write) - file(WRITE "${_generated_qt_plugin_file_name}" - "${_generated_qt_plugin_file_content}") - endif() - - target_sources(${_module_target} INTERFACE - "$<${_plugin_condition}:${_generated_qt_plugin_file_name}>") + __qt_internal_add_static_plugin_linkage("${plugin_target}" "${_module_target}") + __qt_internal_add_static_plugin_import_macro( + "${plugin_target}" ${_module_target} "@QT_MODULE@") endforeach() + set("QT_ALL_PLUGINS_FOUND_BY_FIND_PACKAGE_${__plugin_type}" + "${QT_ALL_PLUGINS_FOUND_BY_FIND_PACKAGE_${__plugin_type}}" + PARENT_SCOPE + ) + set_target_properties(${_module_target} PROPERTIES __qt_internal_plugins_added TRUE) endfunction() -- cgit v1.2.3