diff options
| author | Niels De Graef <nielsdegraef@gmail.com> | 2020-04-19 14:17:59 +0200 |
|---|---|---|
| committer | Niels De Graef <nielsdegraef@gmail.com> | 2020-04-19 14:24:41 +0200 |
| commit | 77fa086cfd82d45fe4836a7aa748abbe95fe43e4 (patch) | |
| tree | cf5a36d9ca74df09d83903ba595f2e5d9e05cd6e /meson.build | |
| parent | 42101865dc375e229eec2faba00bb2d94332f0f2 (diff) | |
| download | gnome-contacts-77fa086cfd82d45fe4836a7aa748abbe95fe43e4.tar.gz | |
Make Cheese a feature dependency
libcanberra-gtk got removed in the latest Flatpak runtime (3.38), so we
can't build cheese as it hard depends on it. Luckily, we don't
hard-depend on cheese, so let's get rid of it (for now).
As an extra, this commit also makes Cheese an optional dependency,
making it a bit easier to build it at the first go (without installing
cheese-devel) and a shorter CI time.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 541fa38..d396073 100644 --- a/meson.build +++ b/meson.build @@ -46,10 +46,8 @@ libebook = dependency('libebook-1.2', version: '>=' + min_eds_version) libedataserver = dependency('libedataserver-1.2', version: '>=' + min_eds_version) libedataserverui = dependency('libedataserverui-1.2', version: '>=' + min_eds_version) -if get_option('cheese') - cheese = dependency('cheese') - cheese_gtk = dependency('cheese-gtk', version: '>= 3.3.91') -endif +cheese_dep = dependency('cheese', required: get_option('cheese')) +cheese_gtk_dep = dependency('cheese-gtk', version: '>= 3.3.91', required: get_option('cheese')) if get_option('telepathy') folks_telepathy = dependency('folks-telepathy', version: '>=' + min_folks_version) |