Merge pull request #2618 from mesonbuild/osxlinkerfixes

Fix many things have have been slightly broken in OSX

2 files changed, 17 insertions, 10 deletions

diff --git a/test cases/osx/2 library versions/CMakeLists.txt b/test cases/osx/2 library versions/CMakeLists.txt
index 82fe1e2..2cd03b9 100644
--- a/test cases/osx/2 library versions/CMakeLists.txt
+++ b/test cases/osx/2 library versions/CMakeLists.txt
@@ -4,23 +4,26 @@ project(dylibversion C)
 # This file is here for debugging purposes to easily compare how
 # CMake does it.
 
+# libnoversion.dylib
 add_library(noversion SHARED lib.c)
 
 # libonlysoversion.dylib -> libonlysoversion.5.dylib
 # libonlyversion.1.4.5.dylib
+# -current_version 1.4.5
 
 add_library(onlyversion SHARED lib.c)
 set_target_properties(onlyversion PROPERTIES VERSION 1.4.5)
 
-# libnoversion.dylib
-# libonlysoversion.5.dylib
+# libonlysoversion.6.dylib
+# -compatibility_version 6.0.0
 
 add_library(onlysoversion SHARED lib.c)
-set_target_properties(onlysoversion PROPERTIES SOVERSION 5)
+set_target_properties(onlysoversion PROPERTIES SOVERSION 6)
 
 # libsome.1.4.5.dylib
-# libsome.5.dylib -> libsome.1.4.5.dylib
-# libsome.dylib -> libsome.5.dylib
+# libsome.6.dylib -> libsome.1.4.5.dylib
+# libsome.dylib -> libsome.6.dylib
+# -current_version 1.4.5 -compatibility_version 5.0.0
 
 add_library(some SHARED lib.c)
-set_target_properties(some PROPERTIES VERSION 1.4.5 SOVERSION 5)
+set_target_properties(some PROPERTIES VERSION 1.4.5 SOVERSION 6)
diff --git a/test cases/osx/2 library versions/meson.build b/test cases/osx/2 library versions/meson.build
index 9624998..3061ed6 100644
--- a/test cases/osx/2 library versions/meson.build
+++ b/test cases/osx/2 library versions/meson.build
@@ -29,15 +29,19 @@ out = custom_target('library-dependency-hack',
 # Manually test if the linker can find the above libraries
 # i.e., whether they were generated with the right naming scheme
 test('manually linked 1', executable('manuallink1', out,
-  link_args : ['-L.', '-lsome']))
+  link_args : ['-L.', '-lsome'],
+  build_rpath : meson.current_build_dir()))
 
 test('manually linked 2', executable('manuallink2', out,
-  link_args : ['-L.', '-lnoversion']))
+  link_args : ['-L.', '-lnoversion'],
+  build_rpath : meson.current_build_dir()))
 
 test('manually linked 3', executable('manuallink3', out,
-  link_args : ['-L.', '-lonlyversion']))
+  link_args : ['-L.', '-lonlyversion'],
+  build_rpath : meson.current_build_dir()))
 
 test('manually linked 4', executable('manuallink4', out,
-  link_args : ['-L.', '-lonlysoversion']))
+  link_args : ['-L.', '-lonlysoversion'],
+  build_rpath : meson.current_build_dir()))
 
 shared_module('module', 'lib.c', install : true)