Merge topic 'BundleUtilities-fix-osx-rpath'
a479d7a0 BundleUtilities: Fix handling of multiple RPATHs from OS X otool
This commit is contained in:
commit
83a1f0a99b
@ -424,7 +424,9 @@ function(get_item_rpaths item rpaths_var)
|
|||||||
string(REGEX MATCHALL "rpath [^\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}")
|
string(REGEX REPLACE "rpath " "" load_cmds_ov "${load_cmds_ov}")
|
||||||
if(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()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user