diff options
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/QtBuild.cmake | 2 | ||||
-rw-r--r-- | cmake/QtPlugins.cmake.in | 40 | ||||
-rw-r--r-- | cmake/QtPostProcess.cmake | 34 |
3 files changed, 58 insertions, 18 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 0852d8ed2f..b2c25b5ef6 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1465,7 +1465,7 @@ function(add_qt_plugin target) "${arg_ARCHIVE_INSTALL_DIRECTORY}" "${arg_TYPE}" "${INSTALL_LIBDIR}/${arg_TYPE}" archive_install_directory) - if(arg_STATIC) + if(arg_STATIC OR NOT BUILD_SHARED_LIBS) add_library("${target}" STATIC) else() add_library("${target}" MODULE) diff --git a/cmake/QtPlugins.cmake.in b/cmake/QtPlugins.cmake.in new file mode 100644 index 0000000000..b51c7cec29 --- /dev/null +++ b/cmake/QtPlugins.cmake.in @@ -0,0 +1,40 @@ +@QT_MODULE_PLUGIN_INCLUDES@ + +if(NOT @BUILD_SHARED_LIBS@) + set(_module_target "@INSTALL_CMAKE_NAMESPACE@::@QT_MODULE@") + + set(_default_plugins_genex "$<GENEX_EVAL:$<TARGET_PROPERTY:QT_DEFAULT_PLUGINS>>") + set(_manual_plugins_genex "$<GENEX_EVAL:$<TARGET_PROPERTY:QT_PLUGINS>>") + set(_no_plugins_genex "$<GENEX_EVAL:$<TARGET_PROPERTY:QT_NO_PLUGINS>>") + + foreach(target @qt_plugins@) + set(_plugin_target "@INSTALL_CMAKE_NAMESPACE@::${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() + endif() + + set(_user_specified_genex "$<IN_LIST:${_plugin_target},${_manual_plugins_genex}>") + + string(CONCAT _plugin_condition + "$<BOOL:$<OR:" + # Add this plugin if it\'s in the list of manual plugins or plugins for the type + "${_user_specified_genex}," + # Add this plugin if the default plugins haven't been disabled, the module of the plug-in + # is either empty or equal to the module name, and the user hasn't blacklisted it + "$<AND:" + "${_default_plugins_genex}," + "$<NOT:$<IN_LIST:${_plugin_target},${_no_plugins_genex}>>" + ">" + ">>" + ) + set(_plugin_genex "$<${_plugin_condition}:${_plugin_target}>") + target_link_libraries(${_module_target} INTERFACE "${_plugin_genex}") + file(GENERATE + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/qt_@QT_MODULE@_${target}.cpp" + CONTENT "#include <QtPlugin>\nQ_IMPORT_PLUGIN(${_classname})" + ) + target_sources(${_module_target} INTERFACE "$<${_plugin_condition}:${CMAKE_CURRENT_BINARY_DIR}/qt_@QT_MODULE@_${target}.cpp>") + endforeach() +endif() diff --git a/cmake/QtPostProcess.cmake b/cmake/QtPostProcess.cmake index 53b89f22f1..f56eb801ea 100644 --- a/cmake/QtPostProcess.cmake +++ b/cmake/QtPostProcess.cmake @@ -239,26 +239,26 @@ endfunction() # the plug-in target files. function(qt_internal_create_plugins_files) message("Generating Plugins files for ${QT_KNOWN_MODULES}...") - foreach (target ${QT_KNOWN_MODULES}) - qt_path_join(config_build_dir ${QT_CONFIG_BUILD_DIR} ${INSTALL_CMAKE_NAMESPACE}${target}) - qt_path_join(config_install_dir ${QT_CONFIG_INSTALL_DIR} ${INSTALL_CMAKE_NAMESPACE}${target}) + foreach (QT_MODULE ${QT_KNOWN_MODULES}) + qt_path_join(config_build_dir ${QT_CONFIG_BUILD_DIR} ${INSTALL_CMAKE_NAMESPACE}${QT_MODULE}) + qt_path_join(config_install_dir ${QT_CONFIG_INSTALL_DIR} ${INSTALL_CMAKE_NAMESPACE}${QT_MODULE}) + set(QT_MODULE_PLUGIN_INCLUDES "") - set(_plugins_file "") - get_target_property(qt_plugins "${target}" QT_PLUGINS) + get_target_property(qt_plugins "${QT_MODULE}" QT_PLUGINS) if(qt_plugins) - foreach (plugin ${qt_plugins}) - set(_plugins_file "${_plugins_file}include(\"\${CMAKE_CURRENT_LIST_DIR}/${plugin}Config.cmake\")\n") + foreach (pluginTarget ${qt_plugins}) + set(QT_MODULE_PLUGIN_INCLUDES "${QT_MODULE_PLUGIN_INCLUDES}include(\"\${CMAKE_CURRENT_LIST_DIR}/${pluginTarget}Config.cmake\")\n") endforeach() - - if(NOT ("x${_plugins_file}" STREQUAL "x")) - file(WRITE "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}Plugins.cmake" "${_plugins_file}") - - qt_install(FILES - "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}Plugins.cmake" - DESTINATION "${config_install_dir}" - COMPONENT Devel - ) - endif() + configure_file( + "${QT_CMAKE_DIR}/QtPlugins.cmake.in" + "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${QT_MODULE}Plugins.cmake" + @ONLY + ) + qt_install(FILES + "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${QT_MODULE}Plugins.cmake" + DESTINATION "${config_install_dir}" + COMPONENT Devel + ) endif() endforeach() endfunction() |