From 7dd7e5038c7c46ef239b4b5eff6b702ead22cfec Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 19 Jul 2024 12:31:06 +0200 Subject: [PATCH] CMake: Fix invalid option passed to _qt_internal_generic_deployqt EXECUTABLE is not a valid option name, EXECUTABLES is. The latter is already passed. Remove the EXECUTABLE option, and add a guard to show an error when there are unparsed arguments. Task-number: QTBUG-127404 Change-Id: I981f6e53925d9b4a9e7ee23f6e80c69dc41e42e8 Reviewed-by: Alexey Edelev (cherry picked from commit 869c6ee890ee740b9e99eca44730524d6a45d4b6) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/Qt6CoreDeploySupport.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/corelib/Qt6CoreDeploySupport.cmake b/src/corelib/Qt6CoreDeploySupport.cmake index 2fc8f8bf1ca..4c259739209 100644 --- a/src/corelib/Qt6CoreDeploySupport.cmake +++ b/src/corelib/Qt6CoreDeploySupport.cmake @@ -205,6 +205,9 @@ function(_qt_internal_generic_deployqt) cmake_parse_arguments(PARSE_ARGV 0 arg "${no_value_options}" "${single_value_options}" "${multi_value_options}" ) + if(arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Unparsed arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() if(arg_VERBOSE OR __QT_DEPLOY_VERBOSE) set(verbose TRUE) @@ -502,7 +505,6 @@ function(qt6_deploy_runtime_dependencies) endif() _qt_internal_generic_deployqt( - EXECUTABLE "${arg_EXECUTABLE}" LIB_DIR "${arg_LIB_DIR}" PLUGINS_DIR "${arg_PLUGINS_DIR}" ${tool_options}