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

Doc: Address QT_DEPLOY_LIBEXEC_DIR issues from API review

Browse Source 
Task-number: QTBUG-121708
Change-Id: I25a05fc26e9950a8b84770347dbcea1912832990
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit b8a78054cf540f082766b1a4d76e42426c1edff9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Joerg Bornemann 2024-01-31 08:50:58 +01:00 committed by Qt Cherry-pick Bot
parent 0869134212
commit 101846afa9
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/corelib/doc/src/cmake/cmake-deploy-variables.qdoc
View File

@ -104,15 +104,14 @@ should not be used for that scenario.
\include cmake-deploy-var-usage.qdocinc \include cmake-deploy-var-usage.qdocinc
\cmakevariablesince 6.8 \cmakevariablesince 6.7
Projects should use \c QT_DEPLOY_LIBEXEC_DIR in their deploy scripts to avoid On Unix derivatives, projects should use \c QT_DEPLOY_LIBEXEC_DIR in their
hard-coding a particular directory in which to deploy the following types of deploy scripts to avoid hard-coding a particular directory in which to deploy
binaries: helper executables that are local to the project.
\list For example, projects using QtWebEngine would deploy the \c QtWebEngineProcess
\li Helper executables that are local to the project on Unix derivatives. executable to this directory.
\endlist
\c QT_DEPLOY_LIBEXEC_DIR defaults to the value of \c${CMAKE_INSTALL_LIBEXECDIR} \c QT_DEPLOY_LIBEXEC_DIR defaults to the value of \c${CMAKE_INSTALL_LIBEXECDIR}
(usually \c{libexec}), which is provided by CMake's \l{GNUInstallDirs} module. (usually \c{libexec}), which is provided by CMake's \l{GNUInstallDirs} module.

2
src/corelib/doc/src/includes/cmake-deploy-modified-variable-values.qdocinc
View File

@ -2,6 +2,8 @@
cmake_minimum_required(VERSION 3.16...3.22) cmake_minimum_required(VERSION 3.16...3.22)
project(MyThings) project(MyThings)
# The following CMAKE_INSTALL_*DIR variables are used to initialize their
# QT_DEPLOY_*_DIR counterparts.
set(CMAKE_INSTALL_BINDIR "mybindir") set(CMAKE_INSTALL_BINDIR "mybindir")
set(CMAKE_INSTALL_LIBDIR "mylibdir") set(CMAKE_INSTALL_LIBDIR "mylibdir")
set(CMAKE_INSTALL_LIBEXECDIR "mylibexecdir") set(CMAKE_INSTALL_LIBEXECDIR "mylibexecdir")