From 9324e4f054fa4d7c213400545e8fa6b42392c5a5 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 17 Nov 2021 12:50:01 -0800 Subject: [PATCH] meson: use dictionary kwargs So we don't have to duplicate the libdrm library call just to not set the version keyword for android Reviewed-by: Simon Ser Signed-off-by: Dylan Baker --- meson.build | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/meson.build b/meson.build index 5824da8a..62dec8dd 100644 --- a/meson.build +++ b/meson.build @@ -308,23 +308,23 @@ libdrm_files = [files( config_file, format_mod_static_table ] +# Build an unversioned so on android if android - libdrm = library('drm', libdrm_files, - c_args : libdrm_c_args, - dependencies : [dep_valgrind, dep_rt, dep_m], - include_directories : inc_drm, - install : true, - ) + libdrm_kw = {} else - libdrm = library('drm', libdrm_files, - c_args : libdrm_c_args, - dependencies : [dep_valgrind, dep_rt, dep_m], - include_directories : inc_drm, - install : true, - version: '2.4.0' - ) + libdrm_kw = {'version' : '2.4.0'} endif +libdrm = library( + 'drm', + libdrm_files, + c_args : libdrm_c_args, + dependencies : [dep_valgrind, dep_rt, dep_m], + include_directories : inc_drm, + install : true, + kwargs : libdrm_kw, +) + test( 'core-symbols-check', symbols_check,