Skip to content

meson: Modernize the file and subproject handling #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

meson: Modernize the file and subproject handling #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ project('vala-language-server', 'vala', 'c',
default_options: [
'default_library=static',
'c_std=gnu11' # for C subprojects
]
],
meson_version: '>=0.55',
)

valac = meson.get_compiler('vala')
libvala_version = run_command(valac, '--api-version').stdout().strip()
libvala_version = run_command(valac, '--api-version', check: true).stdout().strip()
if not libvala_version.version_compare('>=0.48' )
error('libvala needs to be 0.48 or above')
endif
Expand All @@ -18,13 +19,7 @@ extra_vala_sources = []
libvala = dependency('libvala-@0@'.format(libvala_version), version: '>= 0.48.12')

libgobject_dep = dependency('gobject-2.0')
libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.28', required: false)
if not libjsonrpc_glib_dep.found()
# don't use introspection with static library as it requires a recent version of GIR
jsonrpc_glib = subproject('jsonrpc-glib', default_options: ['with_introspection=false'])
libjsonrpc_glib_dep = jsonrpc_glib.get_variable('libjsonrpc_glib_dep')
extra_vala_sources += files('vapi/jsonrpc-glib-1.0.vapi')
endif
libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.28')

deps = [
dependency('glib-2.0'),
Expand All @@ -37,6 +32,11 @@ deps = [
valac.find_library('posix'),
]

# Remove this once we can have a subproject using their own .vapi
if libjsonrpc_glib_dep.type_name() == 'internal'
deps += valac.find_library('jsonrpc-glib-1.0', dirs: meson.current_source_dir() / 'vapi')
endif

if libjsonrpc_glib_dep.version() >= '3.30'
add_project_arguments(['--define=WITH_JSONRPC_GLIB_3_30'], language: 'vala')
endif
Expand Down
2 changes: 1 addition & 1 deletion meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ option('active_parameter', type: 'boolean', value: false, description: 'Support
option('debug_mem', type: 'boolean', value: false, description: 'Debug memory usage')
option('builder_abi', type: 'string', value: 'auto', description: 'Builder ABI version. Use a value like \'3.38\'')
option('man_pages', type: 'feature', value: 'auto', description: 'Generate and install man pages.')
option('tests', type: 'boolean', value: 'true', description: 'Build tests.')
option('tests', type: 'boolean', value: true, description: 'Build tests.')