GetPrerequisites: Add support for @rpath on Mac OS X.
Change to consider a library embedded if it is found in a subdirectory relative to the using executable/library. Previous commit considered them local. This case is encountered when @rpath is used with framework libraries, which are inside a directory tree.
This commit is contained in:
parent
9a6b102205
commit
880139a642
|
@ -478,12 +478,17 @@ function(gp_resolved_file_type original_file file exepath dirs type_var)
|
||||||
|
|
||||||
if(NOT is_system)
|
if(NOT is_system)
|
||||||
get_filename_component(original_path "${original_lower}" PATH)
|
get_filename_component(original_path "${original_lower}" PATH)
|
||||||
string(LENGTH "${original_path}/" original_length)
|
get_filename_component(path "${lower}" PATH)
|
||||||
string(LENGTH "${lower}" path_length)
|
if("${original_path}" STREQUAL "${path}")
|
||||||
if(${path_length} GREATER ${original_length})
|
set(is_local 1)
|
||||||
string(SUBSTRING "${lower}" 0 ${original_length} path)
|
else()
|
||||||
if("${original_path}/" STREQUAL "${path}")
|
string(LENGTH "${original_path}/" original_length)
|
||||||
set(is_local 1)
|
string(LENGTH "${lower}" path_length)
|
||||||
|
if(${path_length} GREATER ${original_length})
|
||||||
|
string(SUBSTRING "${lower}" 0 ${original_length} path)
|
||||||
|
if("${original_path}/" STREQUAL "${path}")
|
||||||
|
set(is_embedded 1)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
Loading…
Reference in New Issue