diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2023-12-15 16:28:50 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2023-12-18 21:55:14 +0100 |
| commit | f355f4fe7ea36c6d2d3a67332a183c9fa7e61b7e (patch) | |
| tree | a3d8fade24c7d46d4195e220b00735737617d892 | |
| parent | 12b4085f45317b1f88fb95f3c3a5f45dfc8f8848 (diff) | |
CMake: Add LIBEXEC_DIR argument to qt_deploy_runtime_dependencies
[ChangeLog][CMake] The qt_deploy_runtime_dependencies function gained
the LIBEXEC_DIR argument to set the directory for deploying helper
executables on Unix derivatives.
Pick-to: 6.7
Change-Id: Icf2b0b439a0e635caa4d9bd2f6950bec74f97c3b
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
| -rw-r--r-- | src/corelib/Qt6CoreDeploySupport.cmake | 4 | ||||
| -rw-r--r-- | src/corelib/doc/src/cmake/qt_deploy_runtime_dependencies.qdoc | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/corelib/Qt6CoreDeploySupport.cmake b/src/corelib/Qt6CoreDeploySupport.cmake index 6560a23e1b..a0e618ba39 100644 --- a/src/corelib/Qt6CoreDeploySupport.cmake +++ b/src/corelib/Qt6CoreDeploySupport.cmake @@ -293,6 +293,7 @@ function(qt6_deploy_runtime_dependencies) EXECUTABLE BIN_DIR LIB_DIR + LIBEXEC_DIR PLUGINS_DIR QML_DIR ) @@ -334,6 +335,9 @@ function(qt6_deploy_runtime_dependencies) if(NOT arg_BIN_DIR) set(arg_BIN_DIR "${QT_DEPLOY_BIN_DIR}") endif() + if(NOT arg_LIBEXEC_DIR) + set(arg_LIBEXEC_DIR "${QT_DEPLOY_LIBEXEC_DIR}") + endif() if(NOT arg_LIB_DIR) set(arg_LIB_DIR "${QT_DEPLOY_LIB_DIR}") endif() diff --git a/src/corelib/doc/src/cmake/qt_deploy_runtime_dependencies.qdoc b/src/corelib/doc/src/cmake/qt_deploy_runtime_dependencies.qdoc index 96f53cd571..2ff7675ffa 100644 --- a/src/corelib/doc/src/cmake/qt_deploy_runtime_dependencies.qdoc +++ b/src/corelib/doc/src/cmake/qt_deploy_runtime_dependencies.qdoc @@ -31,6 +31,7 @@ qt_deploy_runtime_dependencies( [ADDITIONAL_MODULES files...] [GENERATE_QT_CONF] [BIN_DIR bin_dir] + [LIBEXEC_DIR libexec_dir] [LIB_DIR lib_dir] [PLUGINS_DIR plugins_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}. 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. -You can override some of those defaults with the \c{BIN_DIR}, \c{LIB_DIR}, -\c{PLUGINS_DIR}, and \c{QML_DIR} options, all of which are expected to be -relative to the base install location. A \c{qt.conf} file is always written if -\c{executable} is a macOS app bundle, regardless of whether or not +You can override some of those defaults with the \c{BIN_DIR}, \c{LIBEXEC_DIR}, +\c{LIB_DIR}, \c{PLUGINS_DIR}, and \c{QML_DIR} options, all of which are expected +to be relative to the base install location. A \c{qt.conf} file is always +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 that case, since the directory layout of an app bundle is dictated by Apple's requirements. |