From 43871ad7d2fe40c1c6d3044c39a25e11e6359a84 Mon Sep 17 00:00:00 2001
From: Daniel Espinosa <esodan@gmail.com>
Date: Fri, 12 May 2017 08:39:52 -0500
Subject: [PATCH] Meson: set GXML_VERSION to PROJECT_VERSION
---
docs/meson.build | 2 +-
gxml/meson.build | 4 ++--
meson.build | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/meson.build b/docs/meson.build
index 05766268..91057c3d 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -3,7 +3,7 @@ outdir ='GXml-'+API_VERSION
valacapi = run_command ('valac', '--api-version')
driver = '--driver='+valacapi.stdout().strip()
pkgname = '--package-name='+'GXml-'+API_VERSION
-pkgversion = '--package-version='+GXML_VERSION
+pkgversion = '--package-version='+PROJECT_VERSION
vapidirgxml = '--vapidir='+join_paths (meson.current_source_dir (),'gxml')
vapidirvapi = '--vapidir='+join_paths (meson.current_source_dir (),'vapi')
docsdir = join_paths (get_option ('datadir'), 'devhelp','books')
diff --git a/gxml/meson.build b/gxml/meson.build
index 3471fc22..5c2f1b7a 100644
--- a/gxml/meson.build
+++ b/gxml/meson.build
@@ -7,7 +7,7 @@ conf.set('libdir', join_paths (get_option ('prefix'),get_option ('libdir')))
conf.set('includedir', get_option ('includedir'))
conf.set('VALADEPS', VALADEPS)
conf.set('PCDEPS', PCDEPS)
-conf.set('GXML_VERSION', GXML_VERSION)
+conf.set('GXML_VERSION', PROJECT_VERSION)
conf.set('API_VERSION', API_VERSION)
configure_file(input : 'gxml.pc.in',
@@ -127,7 +127,7 @@ inc_gxmlh = include_directories ('.')
gxml = library('gxml-@0@'.format(API_VERSION),
valasources+sources+configvapi,
- version : GXML_VERSION,
+ version : PROJECT_VERSION,
vala_header : 'gxml.h',
vala_vapi : 'gxml-@0@.vapi'.format(API_VERSION),
vala_gir : 'GXml-@0@.gir'.format(API_VERSION),
diff --git a/meson.build b/meson.build
index 5c2f4939..cc983f74 100644
--- a/meson.build
+++ b/meson.build
@@ -8,7 +8,7 @@ VALADEPS = 'gee-0.8\ngio-2.0\nlibxml-2.0'
PCDEPS = 'gee-0.8 gio-2.0 libxml-2.0'
API_VERSION = '0.14'
-GXML_VERSION = '0.15.0'
+PROJECT_VERSION = '0.15.0'
xlibxml_cflags = '-I' + meson.current_source_dir()
--
GitLab