diff options
| author | Alejandro Piñeiro <apinheiro@igalia.com> | 2018-11-15 09:30:39 +0000 |
|---|---|---|
| committer | Alejandro Piñeiro <apinheiro@igalia.com> | 2018-11-15 09:30:39 +0000 |
| commit | 0cb3e626cc4a0897d9ff63ab9b76fa2e98430ad2 (patch) | |
| tree | 6911bb265fdf93ec363ca22f2022282d83ba898a | |
| parent | ab4357d72878dcd8b4a2d93f9155d2521ad8543f (diff) | |
| parent | cbb5f5ac85d336d1d867bf9ecfe50df849f2d201 (diff) | |
| download | atk-0cb3e626cc4a0897d9ff63ab9b76fa2e98430ad2.tar.gz | |
Merge branch 'master' into 'master'
meson: make atk work as a subproject
See merge request GNOME/atk!7
| -rw-r--r-- | atk/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/atk/meson.build b/atk/meson.build index 616a3e6..191e16e 100644 --- a/atk/meson.build +++ b/atk/meson.build @@ -133,7 +133,7 @@ libatk = shared_library('atk-@0@'.format(atk_api_version), link_args: common_ldflags) libatk_dep = declare_dependency(link_with: libatk, - include_directories: atk_inc, + include_directories: [atk_inc, root_inc], dependencies: gobject_dep, sources: atk_enum_h) diff --git a/meson.build b/meson.build index 955fa92..0323896 100644 --- a/meson.build +++ b/meson.build @@ -92,7 +92,7 @@ endforeach # Dependencies gobject_req_version = '>= 2.31.2' -gobject_dep = dependency('gobject-2.0', version: gobject_req_version) +gobject_dep = dependency('gobject-2.0', version: gobject_req_version, fallback : ['glib', 'libgobject_dep']) # Compat variables for pkgconfig pkgconf = configuration_data() |