[atk: 1/2] meson: make atk work as a subproject



commit cbb5f5ac85d336d1d867bf9ecfe50df849f2d201
Author: Niclas Moeslund Overby <noverby prozum dk>
Date:   Sat Nov 10 18:58:00 2018 +0100

    meson: make atk work as a subproject

 atk/meson.build | 2 +-
 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()


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]