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

CMake: Fix invalid option passed to _qt_internal_generic_deployqt

Browse Source 
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 <alexey.edelev@qt.io>
(cherry picked from commit 869c6ee890ee740b9e99eca44730524d6a45d4b6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2024-07-19 12:31:06 +02:00 committed by Qt Cherry-pick Bot
parent 853f7b661f
commit 7dd7e5038c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/Qt6CoreDeploySupport.cmake
View File

@ -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}