whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Add a way to pass additional arguments to win/macdeployqt 

[ChangeLog][CMake] Added the DEPLOY_TOOL_OPTIONS argument to the
functions qt_generate_deploy_app_script and
qt_deploy_runtime_dependencies.

It doesn't make sense to map every option of the deployment tools to
arguments in our CMake deployment API. Allow the user to specify
extra arguments to windeployqt or macdeployqt.

Task-number: QTBUG-116551
Change-Id: I4cc67ab03f19101b695281e8c80f8af825bab7f6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
bb10
Joerg Bornemann 2023-11-15 17:29:21 +01:00
parent ea3289460b
commit a0c9fc6758
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/Qt6CoreDeploySupport.cmake
View File

@ -316,6 +316,7 @@ function(qt6_deploy_runtime_dependencies)
ADDITIONAL_LIBRARIES
ADDITIONAL_MODULES
${file_GRD_options}
DEPLOY_TOOL_OPTIONS
)
cmake_parse_arguments(PARSE_ARGV 0 arg
"${no_value_options}" "${single_value_options}" "${multi_value_options}"
@ -403,6 +404,7 @@ function(qt6_deploy_runtime_dependencies)
if(arg_NO_COMPILER_RUNTIME)
list(APPEND tool_options --no-compiler-runtime)
endif()
list(APPEND tool_options ${arg_DEPLOY_TOOL_OPTIONS})
elseif(__QT_DEPLOY_SYSTEM_NAME STREQUAL Darwin)
set(extra_binaries_option "-executable=")
if(NOT arg_NO_APP_STORE_COMPLIANCE)
@ -411,6 +413,7 @@ function(qt6_deploy_runtime_dependencies)
if(NOT arg_NO_OVERWRITE)
list(APPEND tool_options -always-overwrite)
endif()
list(APPEND tool_options ${arg_DEPLOY_TOOL_OPTIONS})
endif()
# This is an internal variable. It is normally unset and is only intended

1
src/corelib/Qt6CoreMacros.cmake
View File

@ -3267,6 +3267,7 @@ function(qt6_generate_deploy_app_script)
)
set(qt_deploy_runtime_dependencies_options
# These options are forwarded as is to qt_deploy_runtime_dependencies.
DEPLOY_TOOL_OPTIONS
PRE_INCLUDE_REGEXES
PRE_EXCLUDE_REGEXES
POST_INCLUDE_REGEXES

4
src/corelib/doc/src/cmake/qt_deploy_runtime_dependencies.qdoc
View File

@ -39,6 +39,7 @@ qt_deploy_runtime_dependencies(
[NO_APP_STORE_COMPLIANCE]
[NO_TRANSLATIONS]
[NO_COMPILER_RUNTIME]
[DEPLOY_TOOL_OPTIONS]
[PRE_INCLUDE_REGEXES regexes...]
[PRE_EXCLUDE_REGEXES regexes...]
[POST_INCLUDE_REGEXES regexes...]
@ -132,6 +133,9 @@ in a customized way.
For Windows desktop applications, the required runtime files for the compiler
are also installed by default. To prevent this, specify \c{NO_COMPILER_RUNTIME}.
You can use \c{DEPLOY_TOOL_OPTIONS} to pass additional options to the underlying
deployment tool.
On Linux, deploying runtime dependencies is based on CMake's
\c{file(GET_RUNTIME_DEPENDENCIES)} command. The options \c{PRE_INCLUDE_REGEXES},
\c{PRE_EXCLUDE_REGEXES}, \c{POST_INCLUDE_REGEXES}, \c{POST_EXCLUDE_REGEXES},

4
src/corelib/doc/src/cmake/qt_generate_deploy_app_script.qdoc
View File

@ -24,6 +24,7 @@ qt_generate_deploy_app_script(
[NO_TRANSLATIONS]
[NO_COMPILER_RUNTIME]
[NO_UNSUPPORTED_PLATFORM_ERROR]
[DEPLOY_TOOL_OPTIONS ...]
[PRE_INCLUDE_REGEXES regexes...]
[PRE_EXCLUDE_REGEXES regexes...]
[POST_INCLUDE_REGEXES regexes...]
@ -74,6 +75,9 @@ customized way.
For Windows desktop applications, the required runtime files for the compiler
are also installed by default. To prevent this, specify \c{NO_COMPILER_RUNTIME}.
You can use \c{DEPLOY_TOOL_OPTIONS} to pass additional options to the underlying
deployment tool.
For deploying a QML application, use
\l{qt6_generate_deploy_qml_app_script}{qt_generate_deploy_qml_app_script()}
instead.