echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'fixup_bundle_item-fix'

Browse Source 
45ed314bff BundleUtilities: do not run install_name_tool on scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5071
This commit is contained in:
Brad King 2020-07-29 12:12:05 +00:00 committed by Kitware Robot
commit 37e27aa552
6 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Modules/BundleUtilities.cmake
View File

@ -894,11 +894,16 @@ function(fixup_bundle_item resolved_embedded_item exepath dirs)
# to install_name_tool:
#
if(changes)
set(cmd ${CMAKE_INSTALL_NAME_TOOL} ${changes} "${resolved_embedded_item}")
execute_process(COMMAND ${cmd} RESULT_VARIABLE install_name_tool_result)
if(NOT install_name_tool_result EQUAL 0)
string(REPLACE ";" "' '" msg "'${cmd}'")
message(FATAL_ERROR "Command failed:\n ${msg}")
# Check for a script by extension (.bat,.sh,...) or if the file starts with "#!" (shebang)
file(READ ${resolved_embedded_item} file_contents LIMIT 5)
if(NOT "${resolved_embedded_item}" MATCHES "\\.(bat|c?sh|bash|ksh|cmd)$" AND
NOT file_contents MATCHES "^#!")
set(cmd ${CMAKE_INSTALL_NAME_TOOL} ${changes} "${resolved_embedded_item}")
execute_process(COMMAND ${cmd} RESULT_VARIABLE install_name_tool_result)
if(NOT install_name_tool_result EQUAL 0)
string(REPLACE ";" "' '" msg "'${cmd}'")
message(FATAL_ERROR "Command failed:\n ${msg}")
endif()
endif()
endif()
endfunction()

18
Tests/RunCMake/BundleUtilities/ExecutableScripts.cmake Normal file
View File

@ -0,0 +1,18 @@
include(BundleUtilities)
set(BU_CHMOD_BUNDLE_ITEMS ON)
function(check_script script)
fixup_bundle_item(${script} ${script} "" "")
endfunction()
# Should not throw any errors
# Shell script
set(script_sh_EMBEDDED_ITEM ${CMAKE_CURRENT_LIST_DIR}/test.app/script.sh)
check_script(${CMAKE_CURRENT_LIST_DIR}/test.app/script.sh)
# Batch script
set(script_bat_EMBEDDED_ITEM ${CMAKE_CURRENT_LIST_DIR}/test.app/script.bat)
check_script(${CMAKE_CURRENT_LIST_DIR}/test.app/script.bat)
# Shell script without extension
set(script_EMBEDDED_ITEM ${CMAKE_CURRENT_LIST_DIR}/test.app/script)
check_script(${CMAKE_CURRENT_LIST_DIR}/test.app/script)

1
Tests/RunCMake/BundleUtilities/RunCMakeTest.cmake
View File

@ -9,3 +9,4 @@ run_cmake(CMP0080-WARN)
run_cmake_command(CMP0080-COMMAND-OLD ${CMAKE_COMMAND} -DCMP0080_VALUE:STRING=OLD -P ${RunCMake_SOURCE_DIR}/CMP0080-COMMAND.cmake)
run_cmake_command(CMP0080-COMMAND-NEW ${CMAKE_COMMAND} -DCMP0080_VALUE:STRING=NEW -P ${RunCMake_SOURCE_DIR}/CMP0080-COMMAND.cmake)
run_cmake_command(CMP0080-COMMAND-WARN ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/CMP0080-COMMAND.cmake)
run_cmake_command(ExecutableScripts ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/ExecutableScripts.cmake)

3
Tests/RunCMake/BundleUtilities/test.app/script Executable file
View File

@ -0,0 +1,3 @@
#!/bin/bash
echo "Hello World"

3
Tests/RunCMake/BundleUtilities/test.app/script.bat Executable file
View File

@ -0,0 +1,3 @@
@echo off
echo "Hello world"

3
Tests/RunCMake/BundleUtilities/test.app/script.sh Executable file
View File

@ -0,0 +1,3 @@
#!/bin/bash
echo "Hello World"