summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-12-18 15:12:38 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-12-18 15:12:38 (GMT)
commit83a1f0a99b05d5f8d060d5777349a32d196be16d (patch)
tree001a3711f85ea2ff9e2cb4a19c3d70cb558df78f
parent4395190cd474f3e83139961d1271c766604e4a1c (diff)
parenta479d7a0ae1583e0e9471e747393839f1af6a593 (diff)
downloadCMake-83a1f0a99b05d5f8d060d5777349a32d196be16d.zip
CMake-83a1f0a99b05d5f8d060d5777349a32d196be16d.tar.gz
CMake-83a1f0a99b05d5f8d060d5777349a32d196be16d.tar.bz2
Merge topic 'BundleUtilities-fix-osx-rpath'
a479d7a0 BundleUtilities: Fix handling of multiple RPATHs from OS X otool
-rw-r--r--Modules/BundleUtilities.cmake4
1 files changed, 3 insertions, 1 deletions
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()