diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2021-04-06 13:22:19 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2021-04-06 13:22:19 +0000 |
| commit | 94aeed5fdb0758ad144615943f022170046070b8 (patch) | |
| tree | 1e370847ce6417bfdf69746d8cbf0a408420ee02 | |
| parent | 8f90431a01d7333ea8680fd2f9703bacac3e28a2 (diff) | |
| parent | a6cbad8bd3d4d8f05111bcad71ddeeb1db4f8bb7 (diff) | |
| download | gdk-pixbuf-94aeed5fdb0758ad144615943f022170046070b8.tar.gz | |
Merge branch 'ebassi/for-master' into 'master'
Ebassi/for master
See merge request GNOME/gdk-pixbuf!106
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | meson_options.txt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 7880577dc..93fde6629 100644 --- a/meson.build +++ b/meson.build @@ -193,7 +193,7 @@ endif # On non-Windows/macOS/android systems we always required shared-mime-info and GIO # shared_mime_dep = [] shared_mime_dep = [] -if get_option('gio_sniffing') and host_system != 'windows' and host_system != 'darwin' and host_system != 'android' +if get_option('gio_sniffing') and host_system not in ['windows', 'darwin', 'android'] shared_mime_dep += dependency('shared-mime-info') gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1) endif diff --git a/meson_options.txt b/meson_options.txt index b6d82e9b6..5c2641cb6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -17,7 +17,8 @@ option('builtin_loaders', option('gtk_doc', description: 'Whether to generate the API reference', type: 'boolean', - value: false) + value: false, + yield: true) option('docs', description: 'Whether to generate the whole documentation (see: gtk_doc and man options) [Deprecated]', type: 'boolean', |