summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiclas Moeslund Overby <noverby@prozum.dk>2018-11-10 18:58:00 +0100
committerAlejandro PiƱeiro <apinheiro@igalia.com>2019-03-09 11:58:15 +0100
commit5e451251e58b0dd6ad646087ee66b0f17cbf29e8 (patch)
tree6911bb265fdf93ec363ca22f2022282d83ba898a
parent917f7dccf0b9e180a5022c67624f56ae6209df18 (diff)
downloadatk-5e451251e58b0dd6ad646087ee66b0f17cbf29e8.tar.gz
meson: make atk work as a subproject
-rw-r--r--atk/meson.build2
-rw-r--r--meson.build2
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()