diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2018-02-14 13:43:19 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2018-02-14 14:14:22 +0000 |
| commit | d1a8ed02141d7dfbf17f6ec3286d867a8fbd0c2b (patch) | |
| tree | eb0799bdb8590b7419a198b0b078f7207d6a6341 | |
| parent | 4b7017ef357686e8d1d7d6525174b18979a8bd16 (diff) | |
| download | gtk+-d1a8ed02141d7dfbf17f6ec3286d867a8fbd0c2b.tar.gz | |
build: Rename 'with-included-immodules' option
We can call it 'included-immodules', and simplify its logic by always
attempting to split the value, to avoid turning an array into a string
and then back into an array again.
| -rw-r--r-- | meson_options.txt | 4 | ||||
| -rw-r--r-- | modules/input/meson.build | 20 |
2 files changed, 8 insertions, 16 deletions
diff --git a/meson_options.txt b/meson_options.txt index 42283abdd2..2f9dd80285 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -26,8 +26,8 @@ option('enable-xinerama', type: 'combo', choices : ['yes', 'no', 'auto'], value description : 'Enable support for the Xinerama extension') option('dynamic-modules', type: 'boolean', value : true, description : 'Allow dynamic module loading') -option('with-included-immodules', type: 'string', value : '', - description : 'Build the specified input methods into gtk (comma-separated list or "all" or "none")') +option('included-immodules', type: 'string', value : 'none', + description : 'Build the specified input methods (comma-separated list, "all", or "none")') option('documentation', type: 'boolean', value: 'false', description : 'Build API reference and tools documentation') option('man-pages', type: 'boolean', value: 'false', diff --git a/modules/input/meson.build b/modules/input/meson.build index 72171582db..e60dbcc59e 100644 --- a/modules/input/meson.build +++ b/modules/input/meson.build @@ -32,21 +32,15 @@ all_immodules = [ all_immodules += backend_immodules # Allow building some or all immodules included -included_immodules = get_option('with-included-immodules') -if included_immodules == 'none' - included_immodules = '' -elif included_immodules == 'all' or included_immodules == 'yes' - included_immodules = ','.join(all_immodules) -endif - -if included_immodules == '' - have_included_immodules = false +included_immodules = get_option('included-immodules').split(',') +if included_immodules.contains('none') included_immodules = [] -else - have_included_immodules = true - included_immodules = included_immodules.split(',') +elif included_immodules.contains('all') + included_immodules = all_immodules endif +have_included_immodules = included_immodules.length() > 0 + foreach im: included_immodules if not all_immodules.contains(im) error('The specified input method "@0@" is not available (available methods: @1@)'.format(im, ', '.join(all_immodules))) @@ -107,5 +101,3 @@ foreach m: method_defs endif endif endforeach - -# TODO: post-install gtk4-query-immodules run to create immodules.c |