diff options
| author | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-12-02 01:14:02 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-12-02 01:14:02 +0000 |
| commit | b74df8700e81bbbdcd03b2da6dd004f35fa5aa70 (patch) | |
| tree | eacdfcfa1240b105418a86d49a995d5302f3df2a | |
| parent | d6f50489d8f488e6fa84fad63f2a25973e4d3d5b (diff) | |
| parent | 04703e2e9bc6d4f9ebd680c352acfedb829a594a (diff) | |
| download | atk-b74df8700e81bbbdcd03b2da6dd004f35fa5aa70.tar.gz | |
Merge branch 'meson-fix-subproject-usage' into 'master'
meson: Fix usage of glib as a subproject dependency
See merge request GNOME/atk!9
| -rw-r--r-- | atk/meson.build | 4 | ||||
| -rw-r--r-- | meson.build | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/atk/meson.build b/atk/meson.build index 191e16e..69ba6c5 100644 --- a/atk/meson.build +++ b/atk/meson.build @@ -127,14 +127,14 @@ libatk = shared_library('atk-@0@'.format(atk_api_version), soversion: atk_soversion, version: atk_libversion, install: true, - dependencies: gobject_dep, + dependencies: glib_dep, include_directories: [ root_inc, atk_inc ], c_args: common_cflags + atk_cflags, link_args: common_ldflags) libatk_dep = declare_dependency(link_with: libatk, include_directories: [atk_inc, root_inc], - dependencies: gobject_dep, + dependencies: glib_dep, sources: atk_enum_h) if not meson.is_cross_build() and get_option('introspection') diff --git a/meson.build b/meson.build index 7c66a8c..e5a6e3a 100644 --- a/meson.build +++ b/meson.build @@ -92,9 +92,12 @@ foreach f: checked_funcs endforeach # Dependencies -gobject_req_version = '>= 2.31.2' +glib_req_version = '>= 2.31.2' -gobject_dep = dependency('gobject-2.0', version: gobject_req_version, fallback : ['glib', 'libgobject_dep']) +glib_dep = [dependency('glib-2.0', version: glib_req_version, + fallback : ['glib', 'libglib_dep']), + dependency('gobject-2.0', version: glib_req_version, + fallback : ['glib', 'libgobject_dep'])] # Compat variables for pkgconfig pkgconf = configuration_data() |