diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-09-15 11:56:42 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-09-21 14:00:37 +0200 |
| commit | 6f12603cb1ebf636852d972a304c0a6e752977df (patch) | |
| tree | 4a0c29016e6a368a018868a64269b64b8ec6e7e4 /cmake | |
| parent | 0b59c204a4d23d86a0c6dd4f265e4186c633dd98 (diff) | |
Use PARSE_ARGV signature to process arguments instead of escaping
Use PARSE_ARGV signature of the cmake_parse_arguments function to avoid
escaping of semicolons when passing arguments to the
qt_internal_add_configure_time_tool and
qt_internal_add_configure_time_executable function.
Amends ac74b60c9c1101288eb2c558420ba69f675a2ee2
Task-number: QTBUG-87480
Change-Id: I343abbd75107e56aaccab6e388db8dbda0525af3
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtExecutableHelpers.cmake | 3 | ||||
| -rw-r--r-- | cmake/QtToolHelpers.cmake | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake index 44eae75bd2..b8bccdbb07 100644 --- a/cmake/QtExecutableHelpers.cmake +++ b/cmake/QtExecutableHelpers.cmake @@ -355,7 +355,8 @@ function(qt_internal_add_configure_time_executable target) CMAKE_FLAGS ) set(option_args WIN32 MACOSX_BUNDLE NO_INSTALL) - cmake_parse_arguments(arg "${option_args}" "${one_value_args}" "${multi_value_args}" ${ARGN}) + cmake_parse_arguments(PARSE_ARGV 1 arg + "${option_args}" "${one_value_args}" "${multi_value_args}") set(target_binary_dir "${CMAKE_CURRENT_BINARY_DIR}/configure_time_bins") if(arg_CONFIG) diff --git a/cmake/QtToolHelpers.cmake b/cmake/QtToolHelpers.cmake index f79ae2f400..4184610ecd 100644 --- a/cmake/QtToolHelpers.cmake +++ b/cmake/QtToolHelpers.cmake @@ -614,7 +614,8 @@ function(qt_internal_add_configure_time_tool target_name) set(one_value_args INSTALL_DIRECTORY TOOLS_TARGET) set(multi_value_args) set(option_args NO_INSTALL) - cmake_parse_arguments(arg "${option_args}" "${one_value_args}" "${multi_value_args}" ${ARGN}) + cmake_parse_arguments(PARSE_ARGV 1 arg + "${option_args}" "${one_value_args}" "${multi_value_args}") qt_internal_find_tool(will_build_tools ${target_name} "${arg_TOOLS_TARGET}") if(NOT will_build_tools) |