diff options
| author | Matteo Martelli <matteomartelli3@gmail.com> | 2022-09-02 15:50:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-09-06 13:49:54 (GMT) |
| commit | 0c638ab59782fd5210255674f3456d0400ee0223 (patch) | |
| tree | d06778a6142e064cf047f139c6a9c06dba78896b /Tests/RunCMake/CPack/DEB/Helpers.cmake | |
| parent | 01e95efc34a2a9bcf9910d65d3b38ff9b8a51750 (diff) | |
| download | CMake-0c638ab59782fd5210255674f3456d0400ee0223.zip CMake-0c638ab59782fd5210255674f3456d0400ee0223.tar.gz CMake-0c638ab59782fd5210255674f3456d0400ee0223.tar.bz2 | |
CPack: re-use paths of tools discovered by CMakeFindBinUtils
`CMakeFindBinUtils.cmake` sets `CMAKE_<TOOL>` variables that in
cross-compilation environments point to the toolchain specific
executables: e.g. `CMAKE_OBJCOPY` might point to
`<path_to_toolchain>/arm-poky-linux-gnueabi-objcopy`.
Pass this information to CPack.
Diffstat (limited to 'Tests/RunCMake/CPack/DEB/Helpers.cmake')
| -rw-r--r-- | Tests/RunCMake/CPack/DEB/Helpers.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/CPack/DEB/Helpers.cmake b/Tests/RunCMake/CPack/DEB/Helpers.cmake index 9b98ed4..8904c69 100644 --- a/Tests/RunCMake/CPack/DEB/Helpers.cmake +++ b/Tests/RunCMake/CPack/DEB/Helpers.cmake @@ -97,7 +97,7 @@ function(getMissingShlibsErrorExtra FILE RESULT_VAR) string(APPEND error_extra "; errors \"${deb_install_files_errors}\"") endif() - if(READELF_EXECUTABLE) + if(CPACK_READELF_EXECUTABLE) string(APPEND error_extra "; readelf \"\n") # Only dynamically linked ELF files are included @@ -106,7 +106,7 @@ function(getMissingShlibsErrorExtra FILE RESULT_VAR) if(_FILE MATCHES "ELF.*shared object") string(REGEX MATCH "(^.*):" _FILE_NAME "${_FILE}") - execute_process(COMMAND ${READELF_EXECUTABLE} -d "${CMAKE_MATCH_1}" + execute_process(COMMAND ${CPACK_READELF_EXECUTABLE} -d "${CMAKE_MATCH_1}" WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}" RESULT_VARIABLE result OUTPUT_VARIABLE output |