From 08e21a4d3b001352ae6479c8739b02c5157a61bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Mon, 6 May 2019 21:49:20 +0200 Subject: [PATCH] meson: assign get_option('core-plugins-as-shared-libraries') to variable --- decorations/meson.build | 2 +- meson.build | 7 ++++--- modules/meson.build | 4 ++-- particles/meson.build | 7 +++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/decorations/meson.build b/decorations/meson.build index 1e20a4b..1b6daee 100644 --- a/decorations/meson.build +++ b/decorations/meson.build @@ -2,7 +2,7 @@ deco_sdk = declare_dependency(dependencies: [cairo, cairo_ft]) decorations = [] foreach deco : ['background', 'stack', 'underline'] - if get_option('core-plugins-as-shared-libraries') + if plugs_as_libs shared_module('@0@'.format(deco), '@0@.c'.format(deco), dependencies: deco_sdk, name_prefix: 'decoration_', diff --git a/meson.build b/meson.build index 3bbfe27..08b97af 100644 --- a/meson.build +++ b/meson.build @@ -2,10 +2,11 @@ project('f00bar', 'c', license: 'MIT', default_options: ['c_std=c11', 'warning_level=1', 'werror=true']) +plugs_as_libs = get_option('core-plugins-as-shared-libraries') + add_project_arguments( ['-D_GNU_SOURCE'] + - (get_option('core-plugins-as-shared-libraries') ? - ['-DCORE_PLUGINS_AS_SHARED_LIBRARIES'] : []), + (plugs_as_libs ? ['-DCORE_PLUGINS_AS_SHARED_LIBRARIES'] : []), language: 'c', ) @@ -53,7 +54,7 @@ if backend_x11 dependencies: [xcb_aux, xcb_cursor, xcb_event, xcb_ewmh, xcb_randr, xcb_render, cairo_xcb, xcb_errors], c_args: xcb_errors.found() ? '-DHAVE_XCB_ERRORS' : [], - pic: get_option('core-plugins-as-shared-libraries')) + pic: plugs_as_libs) xcb_stuff = declare_dependency(link_with: xcb_stuff_lib) install_headers('xcb.h', subdir: 'f00bar') endif diff --git a/modules/meson.build b/modules/meson.build index dd21bc7..de42d37 100644 --- a/modules/meson.build +++ b/modules/meson.build @@ -32,7 +32,7 @@ foreach mod, data : deps sources = data[0] dep = data[1] - if get_option('core-plugins-as-shared-libraries') + if plugs_as_libs shared_module(mod, '@0@.c'.format(mod), sources, dependencies: [module_sdk] + dep, name_prefix: 'module_', @@ -51,7 +51,7 @@ if backend_x11 sources = data[0] dep = data[1] - if get_option('core-plugins-as-shared-libraries') + if plugs_as_libs shared_module(mod, '@0@.c'.format(mod), sources, dependencies: [module_sdk] + dep, name_prefix: 'module_', diff --git a/particles/meson.build b/particles/meson.build index f016496..2b867c8 100644 --- a/particles/meson.build +++ b/particles/meson.build @@ -2,7 +2,7 @@ particle_sdk = declare_dependency(dependencies: [cairo, cairo_ft]) particles = [] foreach particle : ['empty', 'list', 'map', 'progress-bar', 'ramp', 'string'] - if get_option('core-plugins-as-shared-libraries') + if plugs_as_libs shared_module('@0@'.format(particle), '@0@.c'.format(particle), dependencies: particle_sdk, name_prefix: 'particle_', @@ -18,10 +18,9 @@ endforeach dynlist_lib = build_target( 'dynlist', 'dynlist.c', 'dynlist.h', dependencies: particle_sdk, - target_type: (get_option('core-plugins-as-shared-libraries') - ? 'shared_library' : 'static_library'), + target_type: plugs_as_libs ? 'shared_library' : 'static_library', override_options : ['b_lundef=false'], - install: get_option('core-plugins-as-shared-libraries'), + install: plugs_as_libs, install_dir: get_option('libdir') + '/f00bar', )