diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-11-05 12:55:21 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-11-06 13:19:47 +0000 |
| commit | e116b948335328e6cda5303901edc81df779a910 (patch) | |
| tree | 7cec30344d66a37e0cb7863c9029dfc9db9481fd | |
| parent | 5d51329d270fa7dcaf3140abe98d5cccaab80bfe (diff) | |
| download | meson-e116b948335328e6cda5303901edc81df779a910.zip meson-e116b948335328e6cda5303901edc81df779a910.tar.gz meson-e116b948335328e6cda5303901edc81df779a910.tar.bz2 | |
Install modules in a subdir to fit with platform name mangling
Take advantage of fix_platform_name's new tricks in test '122 shared
module'
4 files changed, 14 insertions, 14 deletions
diff --git a/test cases/common/122 shared module/installed_files.txt b/test cases/common/122 shared module/installed_files.txt index 815f73b..fc94918 100644 --- a/test cases/common/122 shared module/installed_files.txt +++ b/test cases/common/122 shared module/installed_files.txt @@ -1,3 +1,3 @@ -usr/lib/libnosyms.so -?gcc:usr/lib/libnosyms?implib -?msvc:usr/lib/libnosyms.pdb +usr/lib/modules/libnosyms?so +?gcc:usr/lib/modules/libnosyms?implib +?msvc:usr/lib/modules/nosyms.pdb diff --git a/test cases/common/122 shared module/meson.build b/test cases/common/122 shared module/meson.build index 9f9ad63..3d52300 100644 --- a/test cases/common/122 shared module/meson.build +++ b/test cases/common/122 shared module/meson.build @@ -13,8 +13,6 @@ e = executable('prog', 'prog.c', test('import test', e, args : m) # Shared module that does not export any symbols -shared_module('nosyms', 'nosyms.c', install : true, - # Because we don't have cross-platform library support in - # installed_files.txt - name_suffix : 'so', - name_prefix : 'lib') +shared_module('nosyms', 'nosyms.c', + install : true, + install_dir : join_paths(get_option('libdir'), 'modules')) diff --git a/test cases/windows/7 dll versioning/installed_files.txt b/test cases/windows/7 dll versioning/installed_files.txt index 517620e..62b5c9a 100644 --- a/test cases/windows/7 dll versioning/installed_files.txt +++ b/test cases/windows/7 dll versioning/installed_files.txt @@ -14,9 +14,9 @@ ?msvc:usr/libexec/customdir.dll ?msvc:usr/libexec/customdir.lib ?msvc:usr/libexec/customdir.pdb -?msvc:usr/lib/module.dll -?msvc:usr/lib/module.lib -?msvc:usr/lib/module.pdb +?msvc:usr/lib/modules/module.dll +?msvc:usr/lib/modules/module.lib +?msvc:usr/lib/modules/module.pdb ?gcc:usr/bin/?libsome-0.dll ?gcc:usr/lib/libsome.dll.a ?gcc:usr/bin/?libnoversion.dll @@ -27,5 +27,5 @@ ?gcc:usr/lib/libonlysoversion.dll.a ?gcc:usr/libexec/?libcustomdir.dll ?gcc:usr/libexec/libcustomdir.dll.a -?gcc:usr/lib/?libmodule.dll -?gcc:usr/lib/libmodule.dll.a +?gcc:usr/lib/modules/?libmodule.dll +?gcc:usr/lib/modules/libmodule.dll.a diff --git a/test cases/windows/7 dll versioning/meson.build b/test cases/windows/7 dll versioning/meson.build index 80acf88..983c2c4 100644 --- a/test cases/windows/7 dll versioning/meson.build +++ b/test cases/windows/7 dll versioning/meson.build @@ -49,4 +49,6 @@ shared_library('customdir', 'lib.c', install : true, install_dir : get_option('libexecdir')) -shared_module('module', 'lib.c', install : true) +shared_module('module', 'lib.c', + install : true, + install_dir: join_paths(get_option('libdir'), 'modules')) |