Skip to content
Snippets Groups Projects
Commit 43871ad7 authored by Daniel Espinosa's avatar Daniel Espinosa
Browse files

Meson: set GXML_VERSION to PROJECT_VERSION

parent 6231b785
Branches
Tags
No related merge requests found
...@@ -3,7 +3,7 @@ outdir ='GXml-'+API_VERSION ...@@ -3,7 +3,7 @@ outdir ='GXml-'+API_VERSION
valacapi = run_command ('valac', '--api-version') valacapi = run_command ('valac', '--api-version')
driver = '--driver='+valacapi.stdout().strip() driver = '--driver='+valacapi.stdout().strip()
pkgname = '--package-name='+'GXml-'+API_VERSION 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') vapidirgxml = '--vapidir='+join_paths (meson.current_source_dir (),'gxml')
vapidirvapi = '--vapidir='+join_paths (meson.current_source_dir (),'vapi') vapidirvapi = '--vapidir='+join_paths (meson.current_source_dir (),'vapi')
docsdir = join_paths (get_option ('datadir'), 'devhelp','books') docsdir = join_paths (get_option ('datadir'), 'devhelp','books')
......
...@@ -7,7 +7,7 @@ conf.set('libdir', join_paths (get_option ('prefix'),get_option ('libdir'))) ...@@ -7,7 +7,7 @@ conf.set('libdir', join_paths (get_option ('prefix'),get_option ('libdir')))
conf.set('includedir', get_option ('includedir')) conf.set('includedir', get_option ('includedir'))
conf.set('VALADEPS', VALADEPS) conf.set('VALADEPS', VALADEPS)
conf.set('PCDEPS', PCDEPS) conf.set('PCDEPS', PCDEPS)
conf.set('GXML_VERSION', GXML_VERSION) conf.set('GXML_VERSION', PROJECT_VERSION)
conf.set('API_VERSION', API_VERSION) conf.set('API_VERSION', API_VERSION)
configure_file(input : 'gxml.pc.in', configure_file(input : 'gxml.pc.in',
...@@ -127,7 +127,7 @@ inc_gxmlh = include_directories ('.') ...@@ -127,7 +127,7 @@ inc_gxmlh = include_directories ('.')
gxml = library('gxml-@0@'.format(API_VERSION), gxml = library('gxml-@0@'.format(API_VERSION),
valasources+sources+configvapi, valasources+sources+configvapi,
version : GXML_VERSION, version : PROJECT_VERSION,
vala_header : 'gxml.h', vala_header : 'gxml.h',
vala_vapi : 'gxml-@0@.vapi'.format(API_VERSION), vala_vapi : 'gxml-@0@.vapi'.format(API_VERSION),
vala_gir : 'GXml-@0@.gir'.format(API_VERSION), vala_gir : 'GXml-@0@.gir'.format(API_VERSION),
......
...@@ -8,7 +8,7 @@ VALADEPS = 'gee-0.8\ngio-2.0\nlibxml-2.0' ...@@ -8,7 +8,7 @@ VALADEPS = 'gee-0.8\ngio-2.0\nlibxml-2.0'
PCDEPS = 'gee-0.8 gio-2.0 libxml-2.0' PCDEPS = 'gee-0.8 gio-2.0 libxml-2.0'
API_VERSION = '0.14' API_VERSION = '0.14'
GXML_VERSION = '0.15.0' PROJECT_VERSION = '0.15.0'
xlibxml_cflags = '-I' + meson.current_source_dir() xlibxml_cflags = '-I' + meson.current_source_dir()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment