[Cmake-commits] CMake branch, next, updated. v3.4.1-1765-g3ddf434

[Brad King]

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  3ddf434f437c49f4a342796f2a92f28a10465bf6 (commit)
       via  a479d7a0ae1583e0e9471e747393839f1af6a593 (commit)
      from  f07caa4874144ecb7701df41bb1c2e7ef754f16d (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=3ddf434f437c49f4a342796f2a92f28a10465bf6
commit 3ddf434f437c49f4a342796f2a92f28a10465bf6
Merge: f07caa4 a479d7a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 17 10:56:53 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 17 10:56:53 2015 -0500

    Merge topic 'BundleUtilities-fix-osx-rpath' into next
    
    a479d7a0 BundleUtilities: Fix handling of multiple RPATHs from OS X otool


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a479d7a0ae1583e0e9471e747393839f1af6a593
commit a479d7a0ae1583e0e9471e747393839f1af6a593
Author:     Emilie Harquel <emilie.har at gmail.com>
AuthorDate: Wed Dec 16 14:12:56 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 17 10:56:27 2015 -0500

    BundleUtilities: Fix handling of multiple RPATHs from OS X otool
    
    The `otool` command may return multiple RPATH entires, so call
    `gp_append_unique` for each one.  Otherwise we may try to ask
    `install_name_tool` to deal with the same entry twice.

diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index b7975d3..45dda40 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -424,7 +424,9 @@ function(get_item_rpaths item rpaths_var)
     string(REGEX MATCHALL "rpath [^\n]+" load_cmds_ov "${load_cmds_ov}")
     string(REGEX REPLACE "rpath " "" load_cmds_ov "${load_cmds_ov}")
     if(load_cmds_ov)
-      gp_append_unique(${rpaths_var} "${load_cmds_ov}")
+      foreach(rpath ${load_cmds_ov})
+        gp_append_unique(${rpaths_var} "${rpath}")
+      endforeach()
     endif()
   endif()
 

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

Summary of changes:
 Modules/BundleUtilities.cmake |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake