This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via fa1af50e9bbe0506da14019b82cbc86fd1333e02 (commit)
via a27c13f4cad2247833d048ec5e334861943fd4d9 (commit)
from a06bd9fdc9c2ac5a921f6836454fc13c7523d060 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa1af50e9bbe0506da14019b82cbc86fd1333e02
commit fa1af50e9bbe0506da14019b82cbc86fd1333e02
Merge: a06bd9f a27c13f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Feb 10 11:00:39 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Feb 10 11:00:39 2015 -0500
Merge topic 'BundleUtilities-install_name_tool-exit' into next
a27c13f4 BundleUtilities: Teach fixup_bundle to check install_name_tool
result
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a27c13f4cad2247833d048ec5e334861943fd4d9
commit a27c13f4cad2247833d048ec5e334861943fd4d9
Author: Ruslan Baratov <ruslan_bara...@yahoo.com>
AuthorDate: Mon Feb 9 20:09:41 2015 +0300
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Feb 10 11:00:27 2015 -0500
BundleUtilities: Teach fixup_bundle to check install_name_tool result
Fail explicitly if install_name_tool fails to make an update we need.
diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index fee0a7c..ce90f30 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -776,7 +776,12 @@ function(fixup_bundle_item resolved_embedded_item exepath
dirs)
# to install_name_tool:
#
if(changes)
- execute_process(COMMAND install_name_tool ${changes}
"${resolved_embedded_item}")
+ set(cmd 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()
endfunction()
-----------------------------------------------------------------------
Summary of changes:
Modules/BundleUtilities.cmake | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
