More 10.14 fixes also make the version check in cmakelists actually work

This commit is contained in:
Nadia Holmquist Pedersen
2021-04-25 03:51:04 +02:00
parent e0cb998591
commit bc4a156a4d
3 changed files with 3 additions and 119 deletions

View File

@ -47,9 +47,9 @@ def expand_load_path(lib, path)
get_rpaths(lib).each do |rpath|
file = File.join(rpath, file_name)
return file, :rpath if File.exist? file
if rpath.match? /^@executable_path(.*)/
if rpath.match(/^@executable_path(.*)/) != nil
relative = rpath.sub(/^@executable_path/, "")
return "#{$bundle}/Contents/MacOS#{relative}", :executable_path
return "#{$bundle}/Contents/MacOS#{relative}/#{file_name}", :executable_path
end
end
file = $fallback_rpaths
@ -69,9 +69,6 @@ def expand_load_path(lib, path)
return File.absolute_path(path), :absolute
end
puts lib
puts path
exit
return nil
end