[libgit2-glib/wip/meson] Add core include
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgit2-glib/wip/meson] Add core include
- Date: Thu, 29 Dec 2016 15:03:14 +0000 (UTC)
commit b7e4da384578c951b64c501060edfedded8d910e
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Thu Dec 29 16:02:51 2016 +0100
Add core include
libgit2-glib/meson.build | 5 ++---
meson.build | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/libgit2-glib/meson.build b/libgit2-glib/meson.build
index 352b7e0..45a5cab 100644
--- a/libgit2-glib/meson.build
+++ b/libgit2-glib/meson.build
@@ -151,15 +151,14 @@ else
endif
libgit2_glib = shared_library('libgit2-glib-@0@'.format(libgit2_glib_api_version),
+ include_directories: core_inc,
sources: sources + private_headers,
version: libversion,
soversion: soversion,
install: true,
dependencies: platform_deps,
c_args: extra_args + common_flags + debug_flags + [
- '-DG_LOG_DOMAIN="Ggit"',
- '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_30',
- '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32' ],
+ '-DG_LOG_DOMAIN="Ggit"' ],
link_args: libgit2_glib_link_args)
if build_gir
diff --git a/meson.build b/meson.build
index 32b51b4..fd00012 100644
--- a/meson.build
+++ b/meson.build
@@ -153,14 +153,14 @@ endif
extra_args= []
+core_inc = include_directories('.')
+
# Required dependencies
gobject = dependency('gobject-2.0', version: '>= 2.30.0')
build_gobject = gobject.found()
libgit2 = dependency('libgit2', version: '>=0.24.0')
-conf.set('LIBGIT2_GLIB_REQS', 'gobject-2.0')
-
build_gir = build_gobject
if get_option('enable-introspection')
# XXX: Not nice, but probably our best option
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]