diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-22 17:37:55 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-24 20:40:49 +0200 |
| commit | 9bd418aeab6a3d1b814023c35b869a3fc529cbb2 (patch) | |
| tree | 41b7cab935127dd70e2733c31e715bb4cd6ab512 /cmake/QtModuleHelpers.cmake | |
| parent | 4b850065b1631437b65542b3cb1c16077d2f0230 (diff) | |
Implement generating of a module cpp export header
Add an option that automatically generates an export header for a Qt
module. The header contains only Q_DECL_EXPORT/Q_DECL_IMPORT related
content, so it's not a full replacement of 'global' header files.
Task-number: QTBUG-90492
Change-Id: I250d1201b11d4096b7e78e61cbf4565945fe6517
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtModuleHelpers.cmake')
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 46 |
1 files changed, 40 insertions, 6 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 1cb4f718f4..6715c407b3 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -12,6 +12,7 @@ macro(qt_internal_get_internal_add_module_keywords option_args single_args multi NO_CONFIG_HEADER_FILE NO_ADDITIONAL_TARGET_INFO NO_GENERATE_METATYPES + GENERATE_CPP_EXPORTS # TODO: Rename to NO_GENERATE_CPP_EXPORTS once migration is done GENERATE_METATYPES # TODO: Remove once it is not used anymore ) set(${single_args} @@ -20,6 +21,7 @@ macro(qt_internal_get_internal_add_module_keywords option_args single_args multi CONFIG_MODULE_NAME PRECOMPILED_HEADER CONFIGURE_FILE_PATH + CPP_EXPORT_HEADER_NAME ${__default_target_info_args} ) set(${multi_args} @@ -139,6 +141,22 @@ function(qt_internal_add_module target) string(REPLACE "-" "_" module_define_infix "${module_define_infix}") string(REPLACE "." "_" module_define_infix "${module_define_infix}") + if(arg_MODULE_INCLUDE_NAME) + set(module_include_name ${arg_MODULE_INCLUDE_NAME}) + else() + set(module_include_name ${module}) + endif() + + if(arg_GENERATE_CPP_EXPORTS) + if(arg_CPP_EXPORT_HEADER_NAME) + set(cpp_export_header_name "CPP_EXPORT_HEADER_NAME;${arg_CPP_EXPORT_HEADER_NAME}") + endif() + qt_internal_generate_cpp_global_exports(${target} ${module_define_infix} + ${module_include_name} + "${cpp_export_header_name}" + ) + endif() + set(property_prefix "INTERFACE_") if(NOT arg_HEADER_MODULE) qt_set_common_target_properties(${target}) @@ -259,12 +277,6 @@ function(qt_internal_add_module target) endif() endif() - if(arg_MODULE_INCLUDE_NAME) - set(module_include_name ${arg_MODULE_INCLUDE_NAME}) - else() - set(module_include_name ${module}) - endif() - # Module headers: set_property(TARGET "${target}" APPEND PROPERTY EXPORT_PROPERTIES _qt_module_has_headers) if(${arg_NO_MODULE_HEADERS} OR ${arg_NO_SYNC_QT}) @@ -796,3 +808,25 @@ function(qt_describe_module target) qt_install(FILES "${descfile_out}" DESTINATION "${install_dir}") endfunction() + +function(qt_internal_generate_cpp_global_exports target module_define_infix module_include_name) + cmake_parse_arguments(arg + "" + "CPP_EXPORT_HEADER_NAME" + "" ${ARGN}) + qt_internal_module_info(module "${target}") + if(NOT arg_CPP_EXPORT_HEADER_NAME) + set(arg_CPP_EXPORT_HEADER_NAME "qt${module_lower}exports.h") + endif() + + set(generated_header_path + "${QT_BUILD_DIR}/include/${module_include_name}/${arg_CPP_EXPORT_HEADER_NAME}" + ) + + configure_file("${QT_CMAKE_DIR}/modulecppexports.h.in" + "${generated_header_path}" @ONLY + ) + + target_sources(${target} PRIVATE "${generated_header_path}") + set_property(TARGET ${target} APPEND PROPERTY PUBLIC_HEADER "${generated_header_path}") +endfunction() |