Skip to content
Snippets Groups Projects
Unverified Commit 0ec779d7 authored by Tristan Ross's avatar Tristan Ross Committed by Tristan Ross
Browse files

fix: issues with gir and vapi on macOS

parent 74db0f15
Branches
No related tags found
No related merge requests found
......@@ -6,6 +6,7 @@ valacapi = run_command ('valac', '--api-version')
driver = '--driver='+valacapi.stdout().strip()
pkgname = '--package-name='+'GXml-'+API_VERSION
pkgversion = '--package-version='+PROJECT_VERSION
vapidirgee = '--vapidir='+gee_vapidir
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')
......@@ -30,6 +31,7 @@ custom_target ('libgxml-valadocs',
'--pkg=gio-2.0',
'--pkg=libxml-2.0',
'--pkg=gee-0.8',
vapidirgee,
vapidirgxml,
configvapi,
'--directory=@OUTDIR@',
......
......@@ -155,7 +155,7 @@ custom_target('libgxml-typelib',
command: [
g_ir_compiler,
'--shared-library', 'lib'+PROJECT_NAME+'-@0@.so'.format (API_VERSION),
'--output', '@OUTPUT@',
'--output', '@OUTPUT@', '--includedir', gee_girdir,
join_paths(meson.current_build_dir(), GIR_NAME)
],
output: TYPELIB_NAME,
......
......@@ -7,11 +7,16 @@ VERSIONED_PROJECT_NAME = PROJECT_NAME+'-'+API_VERSION
CAMEL_CASE_NAME = 'GXml'
VERSIONED_CAMEL_CASE_NAME = CAMEL_CASE_NAME +'-'+ API_VERSION
gee = dependency('gee-0.8')
gee_girdir = gee.get_variable('datadir') / 'gir-1.0'
gee_vapidir = gee.get_variable('datadir') / 'vala' / 'vapi'
add_project_arguments(['--vapidir', gee_vapidir], language: 'vala')
libgxml_deps = [
dependency('libxml-2.0'),
dependency('gio-2.0'),
dependency('gee-0.8'),
meson.get_compiler('c').find_library('intl', required: false)
meson.get_compiler('c').find_library('intl', required: false),
gee
]
VALADEPS = 'gee-0.8\ngio-2.0\nlibxml-2.0'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment