From 6f12603cb1ebf636852d972a304c0a6e752977df Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 15 Sep 2022 11:56:42 +0200 Subject: [PATCH] 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 --- cmake/QtExecutableHelpers.cmake | 3 ++- cmake/QtToolHelpers.cmake | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake index 44eae75bd2d..b8bccdbb07d 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 f79ae2f400b..4184610ecd3 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)