1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expose cpp export related arguments for qt_internal_add_module users

Browse Source 
Functions that use qt_internal_add_module under the hood might need to
generate cpp exports, e.g. qt_internal_add_qml_module. Append cpp
exports related arguments to the qt_internal_add_module arguments set.

Task-number: QTBUG-90492
Change-Id: I4fd539bd1d8be4d3e57ed5b1b88dd2dbc2f5ca24
Reviewed-by: Craig Scott <craig.scott@qt.io>
This commit is contained in:
Alexey Edelev 2021-09-10 17:24:43 +02:00
parent 8be862687d
commit a7458b2503
1 changed files with 8 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
cmake/QtModuleHelpers.cmake
View File

@ -14,6 +14,7 @@ macro(qt_internal_get_internal_add_module_keywords option_args single_args multi
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
GENERATE_PRIVATE_CPP_EXPORTS
)
set(${single_args}
MODULE_INCLUDE_NAME
@ -21,6 +22,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_BASE_NAME
${__default_target_info_args}
)
set(${multi_args}
@ -34,16 +36,6 @@ macro(qt_internal_get_internal_add_module_keywords option_args single_args multi
)
endmacro()
macro(qt_internal_get_generate_cpp_global_exports_keywords option_args single_args multi_args)
set(${option_args}
GENERATE_PRIVATE_CPP_EXPORTS
)
set(${single_args}
CPP_EXPORT_HEADER_BASE_NAME
)
set(${multi_args} "")
endmacro()
# This is the main entry function for creating a Qt module, that typically
# consists of a library, public header files, private header files and configurable
# features.
@ -76,31 +68,10 @@ function(qt_internal_add_module target)
module_multi_args
)
qt_internal_get_generate_cpp_global_exports_keywords(
cpp_exports_option_args
cpp_exports_single_args
cpp_exports_multi_args
)
set(option_args
${module_option_args}
${cpp_exports_option_args}
)
set(single_args
${module_single_args}
${cpp_exports_single_args}
)
set(multi_args
${module_multi_args}
${cpp_exports_multi_args}
)
qt_parse_all_arguments(arg "qt_internal_add_module"
"${option_args}"
"${single_args}"
"${multi_args}"
"${module_option_args}"
"${module_single_args}"
"${module_multi_args}"
${ARGN}
)
@ -965,16 +936,10 @@ endfunction()
function(qt_internal_generate_cpp_global_exports target module_define_infix
out_public_header out_private_header)
qt_internal_get_generate_cpp_global_exports_keywords(
option_args
single_args
multi_args
)
cmake_parse_arguments(arg
"${option_args}"
"${single_args}"
"${multi_args}" ${ARGN}
"GENERATE_PRIVATE_CPP_EXPORTS"
"CPP_EXPORT_HEADER_BASE_NAME"
"" ${ARGN}
)
qt_internal_module_info(module "${target}")