diff options
| author | Amir Masoud Abdol <amirmasoudabdol@icloud.com> | 2023-01-11 15:36:18 +0100 |
|---|---|---|
| committer | Amir Masoud Abdol <amirmasoudabdol@icloud.com> | 2023-01-18 14:47:12 +0100 |
| commit | 7e82577680fb20413cdcfd93a982c52e9d9d095e (patch) | |
| tree | 749fec2391204d25cb93f659f525f71e473f0f55 /cmake/Qt3rdPartyLibraryHelpers.cmake | |
| parent | 5686824229c331abb690089e94448087f1288556 (diff) | |
Retire the qt_parse_all_arguments
This replaces the qt_parse_all_arguments macro with the built-in
`cmake_parse_arguments(PARSE_ARGV`. In addition, a new function,
_qt_internal_validate_all_args_are_parsed, can be used to check whether
any _UNPARSED_ARGUMENTS have been passed to the function.
Fixes: QTBUG-99238
Change-Id: I8cee83dc92dc6acdaaf747ea6ff9084c11dc649b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/Qt3rdPartyLibraryHelpers.cmake')
| -rw-r--r-- | cmake/Qt3rdPartyLibraryHelpers.cmake | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/cmake/Qt3rdPartyLibraryHelpers.cmake b/cmake/Qt3rdPartyLibraryHelpers.cmake index 220bcaf157..03915938e2 100644 --- a/cmake/Qt3rdPartyLibraryHelpers.cmake +++ b/cmake/Qt3rdPartyLibraryHelpers.cmake @@ -14,12 +14,12 @@ endmacro() # Everything else is just prepation for option validating. function(qt_internal_add_common_qt_library_helper target) qt_internal_get_add_library_option_args(option_args) - qt_parse_all_arguments(arg "qt_internal_add_common_qt_library_helper" + cmake_parse_arguments(PARSE_ARGV 1 arg "${option_args}" "" "" - ${ARGN} ) + _qt_internal_validate_all_args_are_parsed(arg) if(arg_SHARED) set(arg_SHARED SHARED) @@ -67,12 +67,12 @@ function(qt_internal_add_cmake_library target) ${__default_public_args} ) - qt_parse_all_arguments(arg "qt_add_cmake_library" + cmake_parse_arguments(PARSE_ARGV 1 arg "${option_args}" "${single_args}" "${multi_args}" - ${ARGN} ) + _qt_internal_validate_all_args_are_parsed(arg) qt_remove_args(library_helper_args ARGS_TO_REMOVE @@ -141,12 +141,12 @@ function(qt_internal_add_3rdparty_library target) ${__default_public_args} ) - qt_parse_all_arguments(arg "qt_internal_add_3rdparty_library" + cmake_parse_arguments(PARSE_ARGV 1 arg "${library_option_args};${option_args}" "${single_args}" "${multi_args}" - ${ARGN} ) + _qt_internal_validate_all_args_are_parsed(arg) qt_remove_args(library_helper_args ARGS_TO_REMOVE @@ -349,12 +349,13 @@ function(qt_internal_add_3rdparty_header_module target) set(multi_args EXTERNAL_HEADERS ) - qt_parse_all_arguments(arg "qt_internal_add_header_module" + cmake_parse_arguments(PARSE_ARGV 1 arg "${option_args}" "${single_args}" "${multi_args}" - ${ARGN} ) + _qt_internal_validate_all_args_are_parsed(arg) + qt_internal_add_module(${target} INTERNAL_MODULE HEADER_MODULE |