mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 12:49:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

BundleUtilites: Don't use hardcoded name for install_name_tool

Browse Source
This commit is contained in:
Alexander Grund
2018-12-30 15:17:35 +01:00
committed by Craig Scott
parent 428680da92
commit 5072598f07
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/BundleUtilities.cmake
+6 -2
View File
@@ -877,9 +877,13 @@ function(fixup_bundle_item resolved_embedded_item exepath dirs)
execute_process(COMMAND chmod u+w "${resolved_embedded_item}") execute_process(COMMAND chmod u+w "${resolved_embedded_item}")
endif() endif()
# CMAKE_INSTALL_NAME_TOOL may not be set if executed in script mode
# Duplicated from CMakeFindBinUtils.cmake
find_program(CMAKE_INSTALL_NAME_TOOL NAMES install_name_tool HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
# Only if install_name_tool supports -delete_rpath: # Only if install_name_tool supports -delete_rpath:
# #
execute_process(COMMAND install_name_tool execute_process(COMMAND ${CMAKE_INSTALL_NAME_TOOL}
OUTPUT_VARIABLE install_name_tool_usage OUTPUT_VARIABLE install_name_tool_usage
ERROR_VARIABLE install_name_tool_usage ERROR_VARIABLE install_name_tool_usage
) )
@@ -897,7 +901,7 @@ function(fixup_bundle_item resolved_embedded_item exepath dirs)
# to install_name_tool: # to install_name_tool:
# #
if(changes) if(changes)
set(cmd install_name_tool ${changes} "${resolved_embedded_item}") set(cmd ${CMAKE_INSTALL_NAME_TOOL} ${changes} "${resolved_embedded_item}")
execute_process(COMMAND ${cmd} RESULT_VARIABLE install_name_tool_result) execute_process(COMMAND ${cmd} RESULT_VARIABLE install_name_tool_result)
if(NOT install_name_tool_result EQUAL 0) if(NOT install_name_tool_result EQUAL 0)
string(REPLACE ";" "' '" msg "'${cmd}'") string(REPLACE ";" "' '" msg "'${cmd}'")