diff options
author | Craig Scott <craig.scott@crascit.com> | 2024-06-01 22:19:56 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2024-06-01 22:20:20 (GMT) |
commit | 95bbd028f0a171e71f2ffd0ddfa4b67c3a8e7394 (patch) | |
tree | 43d4f2260e0d257ea009e2e0604dfdc3899fc1b9 /Modules | |
parent | fdf671fcc52301d1f3637e7f92ae4c5930fa3606 (diff) | |
parent | dca468e1de291aa71d84c635a9b6aeb4ee685dc2 (diff) | |
download | CMake-95bbd028f0a171e71f2ffd0ddfa4b67c3a8e7394.zip CMake-95bbd028f0a171e71f2ffd0ddfa4b67c3a8e7394.tar.gz CMake-95bbd028f0a171e71f2ffd0ddfa4b67c3a8e7394.tar.bz2 |
Merge topic 'doc-cpack-reuse-CMakeFindBinUtils'
dca468e1de Help: Improve and clarify wording for CPACK_<TOOL>_EXECUTABLE
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9566
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/CPack.cmake | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index 813ac3c..ed9a7a5 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -478,27 +478,30 @@ The following variables are for advanced uses of CPack: .. versionadded:: 3.25 Specify the ``readelf`` executable path used by CPack. - The default value will be ``CMAKE_READELF`` when set. Otherwise, - the default value will be empty and CPack will use :command:`find_program` - to determine the ``readelf`` path when needed. + The default value will be taken from the ``CMAKE_READELF`` variable, if set, + which may be populated by an internal CMake module. If ``CMAKE_READELF`` + is not set, CPack will use :command:`find_program` to determine the + ``readelf`` path when needed. .. variable:: CPACK_OBJCOPY_EXECUTABLE .. versionadded:: 3.25 Specify the ``objcopy`` executable path used by CPack. - The default value will be ``CMAKE_OBJCOPY`` when set. Otherwise, - the default value will be empty and CPack will use :command:`find_program` - to determine the ``objcopy`` path when needed. + The default value will be taken from the ``CMAKE_OBJCOPY`` variable, if set, + which may be populated by an internal CMake module. If ``CMAKE_OBJCOPY`` + is not set, CPack will use :command:`find_program` to determine the + ``objcopy`` path when needed. .. variable:: CPACK_OBJDUMP_EXECUTABLE .. versionadded:: 3.25 Specify the ``objdump`` executable path used by CPack. - The default value will be ``CMAKE_OBJDUMP`` when set. Otherwise, - the default value will be empty and CPack will use :command:`find_program` - to determine the ``objdump`` path when needed. + The default value will be taken from the ``CMAKE_OBJDUMP`` variable, if set, + which may be populated by an internal CMake module. If ``CMAKE_OBJDUMP`` + is not set, CPack will use :command:`find_program` to determine the + ``objdump`` path when needed. #]=======================================================================] |