[Cmake-commits] CMake branch, master, updated. v3.12.0-285-g21835a2

[Kitware Robot]

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, master has been updated
       via  21835a2cea52d5518762bab87d466387b8fb936b (commit)
       via  22554c3166aaf7feaebf02b0ddc1204f13b22e3c (commit)
      from  33dec05375558e99a6e2947e036f84a7a6315781 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21835a2cea52d5518762bab87d466387b8fb936b
commit 21835a2cea52d5518762bab87d466387b8fb936b
Merge: 33dec05 22554c3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 23 15:02:42 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jul 23 11:02:57 2018 -0400

    Merge topic 'BundleUtilities-otool-l-error'
    
    22554c3166 BundleUtilities: message(FATAL_ERROR) on otool -l error
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2227


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22554c3166aaf7feaebf02b0ddc1204f13b22e3c
commit 22554c3166aaf7feaebf02b0ddc1204f13b22e3c
Author:     Harry Mallon <hjmallon at gmail.com>
AuthorDate: Fri Jul 20 12:06:04 2018 +0100
Commit:     Harry Mallon <hjmallon at gmail.com>
CommitDate: Fri Jul 20 12:06:04 2018 +0100

    BundleUtilities: message(FATAL_ERROR) on otool -l error

diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index 121a8f0..4727f03 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -421,7 +421,12 @@ function(get_item_rpaths item rpaths_var)
     execute_process(
       COMMAND "${otool_cmd}" -l "${item}"
       OUTPUT_VARIABLE load_cmds_ov
+      RESULT_VARIABLE otool_rv
+      ERROR_VARIABLE otool_ev
       )
+    if(NOT otool_rv STREQUAL "0")
+      message(FATAL_ERROR "otool -l failed: ${otool_rv}\n${otool_ev}")
+    endif()
     string(REGEX REPLACE "[^\n]+cmd LC_RPATH\n[^\n]+\n[^\n]+path ([^\n]+) \\(offset[^\n]+\n" "rpath \\1\n" load_cmds_ov "${load_cmds_ov}")
     string(REGEX MATCHALL "rpath [^\n]+" load_cmds_ov "${load_cmds_ov}")
     string(REGEX REPLACE "rpath " "" load_cmds_ov "${load_cmds_ov}")

-----------------------------------------------------------------------

Summary of changes:
 Modules/BundleUtilities.cmake | 5 +++++
 1 file changed, 5 insertions(+)


hooks/post-receive
-- 
CMake