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

CMake: Add LIBEXEC_DIR argument to qt_deploy_runtime_dependencies

Browse Source 
[ChangeLog][CMake] The qt_deploy_runtime_dependencies function gained
the LIBEXEC_DIR argument to set the directory for deploying helper
executables on Unix derivatives.

Change-Id: Icf2b0b439a0e635caa4d9bd2f6950bec74f97c3b
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit f355f4fe7ea36c6d2d3a67332a183c9fa7e61b7e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Joerg Bornemann 2023-12-15 16:28:50 +01:00 committed by Qt Cherry-pick Bot
parent d62b4d84c1
commit e4697acbc8
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/Qt6CoreDeploySupport.cmake
View File

@ -293,6 +293,7 @@ function(qt6_deploy_runtime_dependencies)
EXECUTABLE EXECUTABLE
BIN_DIR BIN_DIR
LIB_DIR LIB_DIR
LIBEXEC_DIR
PLUGINS_DIR PLUGINS_DIR
QML_DIR QML_DIR
) )
@ -334,6 +335,9 @@ function(qt6_deploy_runtime_dependencies)
if(NOT arg_BIN_DIR) if(NOT arg_BIN_DIR)
set(arg_BIN_DIR "${QT_DEPLOY_BIN_DIR}") set(arg_BIN_DIR "${QT_DEPLOY_BIN_DIR}")
endif() endif()
if(NOT arg_LIBEXEC_DIR)
set(arg_LIBEXEC_DIR "${QT_DEPLOY_LIBEXEC_DIR}")
endif()
if(NOT arg_LIB_DIR) if(NOT arg_LIB_DIR)
set(arg_LIB_DIR "${QT_DEPLOY_LIB_DIR}") set(arg_LIB_DIR "${QT_DEPLOY_LIB_DIR}")
endif() endif()

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

@ -31,6 +31,7 @@ qt_deploy_runtime_dependencies(
[ADDITIONAL_MODULES files...] [ADDITIONAL_MODULES files...]
[GENERATE_QT_CONF] [GENERATE_QT_CONF]
[BIN_DIR bin_dir] [BIN_DIR bin_dir]
[LIBEXEC_DIR libexec_dir]
[LIB_DIR lib_dir] [LIB_DIR lib_dir]
[PLUGINS_DIR plugins_dir] [PLUGINS_DIR plugins_dir]
[QML_DIR qml_dir] [QML_DIR qml_dir]
@ -103,10 +104,10 @@ directory structure. If the \c{GENERATE_QT_CONF} option is given, an appropriate
\c{qt.conf} file will be written to the same directory as the \c{executable}. \c{qt.conf} file will be written to the same directory as the \c{executable}.
The paths in that \c{qt.conf} file will be based on the \c{CMAKE_INSTALL_xxxDIR} The paths in that \c{qt.conf} file will be based on the \c{CMAKE_INSTALL_xxxDIR}
variables, whose defaults are provided by CMake's \l{GNUInstallDirs} module. variables, whose defaults are provided by CMake's \l{GNUInstallDirs} module.
You can override some of those defaults with the \c{BIN_DIR}, \c{LIB_DIR}, You can override some of those defaults with the \c{BIN_DIR}, \c{LIBEXEC_DIR},
\c{PLUGINS_DIR}, and \c{QML_DIR} options, all of which are expected to be \c{LIB_DIR}, \c{PLUGINS_DIR}, and \c{QML_DIR} options, all of which are expected
relative to the base install location. A \c{qt.conf} file is always written if to be relative to the base install location. A \c{qt.conf} file is always
\c{executable} is a macOS app bundle, regardless of whether or not written if \c{executable} is a macOS app bundle, regardless of whether or not
\c{GENERATE_QT_CONF} is provided. The \c{..._DIR} options are also ignored in \c{GENERATE_QT_CONF} is provided. The \c{..._DIR} options are also ignored in
that case, since the directory layout of an app bundle is dictated by Apple's that case, since the directory layout of an app bundle is dictated by Apple's
requirements. requirements.