kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Emilie Harquel 2015-12-16 14:12:56 +01:00 committed by Brad King
parent 2913876c58
commit a479d7a0ae
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/BundleUtilities.cmake
View File

@ -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()