[gtk-vnc] build-sys: build meson requirement to >=0.56
- From: Daniel P. Berrange <dberrange src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-vnc] build-sys: build meson requirement to >=0.56
- Date: Mon, 26 Sep 2022 09:13:11 +0000 (UTC)
commit 061128e1400f1f76a00db1bb74e19bceaa9634ce
Author: Marc-André Lureau <marcandre lureau gmail com>
Date: Tue Sep 6 16:49:32 2022 +0400
build-sys: build meson requirement to >=0.56
Modernize a little bit the meson file, to avoid extra warnings when
running a recent meson versions.
Signed-off-by: Marc-André Lureau <marcandre lureau redhat com>
meson.build | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/meson.build b/meson.build
index db34df3..925f241 100644
--- a/meson.build
+++ b/meson.build
@@ -7,7 +7,7 @@ project(
'c_std=gnu99',
'warning_level=2',
],
- meson_version: '>= 0.49.0'
+ meson_version: '>= 0.56.0'
)
version_info = meson.project_version().split('.')
@@ -22,17 +22,17 @@ conf_data.set('version_minor', version_minor)
conf_data.set('version_micro', version_micro)
# ninja dist helper
-meson.add_dist_script('build-aux/dist.sh', meson.source_root(), meson.build_root())
+meson.add_dist_script('build-aux/dist.sh', meson.project_source_root(), meson.project_build_root())
git = run_command('test', '-d', '.git', check: false).returncode() == 0
if git
test(
'syntax-check',
- find_program('@0@/build-aux/syntax-check'.format(meson.source_root())),
+ find_program('@0@/build-aux/syntax-check'.format(meson.project_source_root())),
suite: 'style',
env: [
- 'MESON_SOURCE_ROOT=@0@'.format(meson.source_root()),
+ 'MESON_SOURCE_ROOT=@0@'.format(meson.project_source_root()),
],
)
endif
@@ -301,7 +301,7 @@ conf_data.set('localedir', gtk_vnc_localedir)
gtk_vnc_pkgdatadir = join_paths(gtk_vnc_datadir, meson.project_name())
-po_dir = join_paths(meson.source_root(), 'po')
+po_dir = join_paths(meson.project_source_root(), 'po')
conf_data.set('tls_priority', get_option('with-tls-priority'))
@@ -325,7 +325,7 @@ if not vala_opt.disabled()
error('Vala API requires GObject introspection (-Dintrospection=true)')
endif
else
- with_vala = add_languages('vala', required: vala_opt)
+ with_vala = add_languages('vala', required: vala_opt, native: false)
endif
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]