[libgit2-glib] meson: Use meson's naming convention
- From: Iñigo Martínez <inigomartinez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgit2-glib] meson: Use meson's naming convention
- Date: Mon, 22 Jan 2018 09:33:15 +0000 (UTC)
commit 88dd8f6e62d970a52879d921c95653cb0e9e38b0
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Fri Jan 19 16:23:24 2018 +0100
meson: Use meson's naming convention
The convention when naming dependencies is to use the '_dep' suffix,
which helps detecting dependency variables. The variables have been
renamed to follow this convention.
https://bugzilla.gnome.org/show_bug.cgi?id=792699
docs/reference/meson.build | 2 +-
libgit2-glib/meson.build | 7 ++++++-
meson.build | 8 ++++----
3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 63adc7b..8f545e7 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -7,7 +7,7 @@ configure_file(input: name + '.in',
output: name,
configuration: docs_conf)
-glib_prefix = glib.get_pkgconfig_variable('prefix')
+glib_prefix = glib_dep.get_pkgconfig_variable('prefix')
glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
gnome.gtkdoc(libgit2_glib_api_name,
diff --git a/libgit2-glib/meson.build b/libgit2-glib/meson.build
index 64f2596..dbcdcd2 100644
--- a/libgit2-glib/meson.build
+++ b/libgit2-glib/meson.build
@@ -185,7 +185,12 @@ enum_types = gnome.mkenums('ggit-enum-types',
install_headers(headers, subdir: join_paths(libgit2_glib_api_name, meson.project_name()))
-platform_deps = [ glib, gobject, gio, libgit2 ]
+platform_deps = [
+ gio_dep,
+ glib_dep,
+ gobject_dep,
+ libgit2_dep
+]
if cc.get_id() == 'msvc'
libgit2_glib_link_args = []
diff --git a/meson.build b/meson.build
index 6aa8e8e..e553887 100644
--- a/meson.build
+++ b/meson.build
@@ -111,11 +111,11 @@ core_inc = include_directories('.')
git2_req = '0.25.0'
glib_req = '2.44.0'
-glib = dependency('glib-2.0', version: '>=' + glib_req)
-gobject = dependency('gobject-2.0', version: '>=' + glib_req)
-gio = dependency('gio-2.0', version: '>=' + glib_req)
+glib_dep = dependency('glib-2.0', version: '>=' + glib_req)
+gobject_dep = dependency('gobject-2.0', version: '>=' + glib_req)
+gio_dep = dependency('gio-2.0', version: '>=' + glib_req)
-libgit2 = dependency('libgit2', version: '>=' + git2_req)
+libgit2_dep = dependency('libgit2', version: '>=' + git2_req)
enable_gir = get_option('introspection')
if enable_gir
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]