diff options
| author | Richard Hughes <richard@hughsie.com> | 2016-12-07 08:15:04 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2016-12-07 08:15:13 +0000 |
| commit | c599555d143fdf7444d9b587b61fc089ef4b6f87 (patch) | |
| tree | 6e01b80d8457075835938bfdcbac4e8d4386ec29 | |
| parent | 0dddb3f191a90586d4c444136ef4e7cc3b192103 (diff) | |
| download | appstream-glib-wip/hughsie/meson.tar.gz | |
| -rw-r--r-- | libappstream-builder/meson.build | 12 | ||||
| -rw-r--r-- | libappstream-glib/meson.build | 3 | ||||
| -rw-r--r-- | meson.build | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/libappstream-builder/meson.build b/libappstream-builder/meson.build index f13f130..ed9c4ea 100644 --- a/libappstream-builder/meson.build +++ b/libappstream-builder/meson.build @@ -8,7 +8,17 @@ asbuilder_cargs = [ ), ] -deps = [glib, gmodule, gdkpixbuf, libarchive, soup, yaml] +deps = [ + glib, + gmodule, + gdkpixbuf, + libarchive, + soup +] + +if get_option('enable-dep11') + deps = deps + [yaml] +endif if rpm.found() deps = deps + [rpm] diff --git a/libappstream-glib/meson.build b/libappstream-glib/meson.build index de3a487..acfcbb9 100644 --- a/libappstream-glib/meson.build +++ b/libappstream-glib/meson.build @@ -7,7 +7,7 @@ cargs = [ deps = [glib, gdkpixbuf, giounix, libarchive, soup, uuid, libgcab] -if yaml.found() +if get_option('enable-dep11') deps += yaml endif @@ -214,6 +214,7 @@ gnome.generate_gir(asglib, symbol_prefix : 'as_', identifier_prefix : 'As', export_packages : 'appstream-glib', + dependencies : deps, includes : [ 'GObject-2.0', 'Gio-2.0', diff --git a/meson.build b/meson.build index 31b4dbb..b04a9f3 100644 --- a/meson.build +++ b/meson.build @@ -75,8 +75,6 @@ endif if get_option('enable-dep11') yaml = dependency('yaml-0.1') conf.set('AS_BUILD_DEP11', 1) -else - yaml = dependency('yaml-0.1', required : false) endif # use gperf for faster string -> enum matching |