From fa07007389c9662b654680464cf88d8894e4e64d Mon Sep 17 00:00:00 2001 From: Tom Schoonjans Date: Fri, 11 Oct 2019 08:55:12 +0100 Subject: [PATCH] meson: ensure plugins have so extension on macOS --- meson.build | 5 +++++ modules/input/meson.build | 1 + modules/printbackends/meson.build | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/meson.build b/meson.build index 60ef872f52..ba93dcc3f8 100644 --- a/meson.build +++ b/meson.build @@ -823,6 +823,11 @@ if profiler_enabled endif endif +module_suffix = [] +if os_darwin + module_suffix = 'so' +endif + build_gir = get_option('introspection') subdir('gdk') subdir('gtk') diff --git a/modules/input/meson.build b/modules/input/meson.build index 09625a93c1..7b201af894 100644 --- a/modules/input/meson.build +++ b/modules/input/meson.build @@ -15,6 +15,7 @@ foreach l: immodules install_dir: '@0@/gtk-@1@/@2@/immodules/'.format(gtk_libdir, gtk_api_version, gtk_binary_version), include_directories: [confinc, gtkinc], install : true, + name_suffix: module_suffix, name_prefix: '') endif endforeach diff --git a/modules/printbackends/meson.build b/modules/printbackends/meson.build index a3dd649e5a..7ffe671c4b 100644 --- a/modules/printbackends/meson.build +++ b/modules/printbackends/meson.build @@ -112,6 +112,7 @@ if print_backends.contains('file') c_args: printbackends_args, dependencies: libgtk_dep, install_dir: printbackends_install_dir, + name_suffix: module_suffix, install : true) endif @@ -121,6 +122,7 @@ if print_backends.contains('lpr') c_args: printbackends_args, dependencies: libgtk_dep, install_dir: printbackends_install_dir, + name_suffix: module_suffix, install : true) endif @@ -130,6 +132,7 @@ if print_backends.contains('test') c_args: printbackends_args, dependencies: libgtk_dep, install_dir: printbackends_install_dir, + name_suffix: module_suffix, install : true) endif @@ -141,6 +144,7 @@ if print_backends.contains('cloudprint') c_args: printbackends_args, dependencies: [ libgtk_dep, rest_dep, json_glib_dep ], install_dir: printbackends_install_dir, + name_suffix: module_suffix, install : true) endif @@ -153,5 +157,6 @@ if print_backends.contains('cups') c_args: printbackends_args, dependencies: [libgtk_dep, cups_dep] + cups_extra_deps, install_dir: printbackends_install_dir, + name_suffix: module_suffix, install : true) endif