diff options
| author | Niels De Graef <nielsdegraef@gmail.com> | 2018-04-01 12:55:01 +0200 |
|---|---|---|
| committer | Niels De Graef <nielsdegraef@gmail.com> | 2018-04-01 12:55:01 +0200 |
| commit | b7201bad70db5fac262ccda4b4df74ad7fa27374 (patch) | |
| tree | 78c9392ee2684504e30d0470ed9c691bfecffda0 | |
| parent | 59c350aaf51b8f26b93130f4d0abe23d754f3827 (diff) | |
| download | gnome-contacts-b7201bad70db5fac262ccda4b4df74ad7fa27374.tar.gz | |
Meson: don't use 'auto' values for cheese option.
| -rw-r--r-- | meson.build | 8 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/meson.build b/meson.build index 09f9526..4ad46c5 100644 --- a/meson.build +++ b/meson.build @@ -14,7 +14,7 @@ add_project_arguments( ) # Options -cheese_enabled = (get_option('with-cheese') != 'no') +cheese_enabled = get_option('with-cheese') telepathy_enabled = get_option('telepathy') docs_enabled = get_option('docs') manpage_enabled = get_option('with-manpage') @@ -52,10 +52,8 @@ libedataserver = dependency('libedataserver-1.2', version: '>=' + min_eds_versio libedataserverui = dependency('libedataserverui-1.2', version: '>=' + min_eds_version) if cheese_enabled - cheese_required = (cheese_enabled == 'yes') - cheese = dependency('cheese', required: cheese_required) - cheese_gtk = dependency('cheese-gtk', version: '>= 3.3.91', required: cheese_required) - cheese_enabled = cheese.found() and cheese_gtk.found() + cheese = dependency('cheese') + cheese_gtk = dependency('cheese-gtk', version: '>= 3.3.91') endif if telepathy_enabled diff --git a/meson_options.txt b/meson_options.txt index 7dc0cb2..40d2c52 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,4 @@ -option('with-cheese', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'enable cheese webcam support') +option('with-cheese', type: 'boolean', value: true, description: 'Enable cheese webcam support.') option('telepathy', type: 'boolean', value: true, description: 'Enable Telepathy call/chat support.') option('with-manpage', type: 'boolean', value: true, description: 'enable building man pages') option('docs', type: 'boolean', value: false, description: 'Whether to build the valadoc docs.') |