From 7b7422f98e39f05ac0c8fa31d352213f0f56e2e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 6 Dec 2022 11:21:05 +0100 Subject: [PATCH] build: Bump required meson version --- data/meson.build | 2 +- meson.build | 2 +- tests/meson.build | 2 +- tests/services/meson.build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/meson.build b/data/meson.build index 1f4e809..762b0e6 100644 --- a/data/meson.build +++ b/data/meson.build @@ -59,7 +59,7 @@ if json_glib_validate.found() build_by_default: true, input: theme_json, output: 'json_validate_stamp', - command: [json_glib_validate.path()] + jsons) + command: [json_glib_validate.full_path()] + jsons) endif endif # daemon diff --git a/meson.build b/meson.build index 547b5da..7835999 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project('feedbackd', 'c', version : '0.0.1', license : 'LGPLv3+', - meson_version : '>= 0.49.0', + meson_version : '>= 0.56.0', default_options : [ 'warning_level=1', 'buildtype=debugoptimized', diff --git a/tests/meson.build b/tests/meson.build index 2fd62d3..d9905f5 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -5,7 +5,7 @@ test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) test_env.set('G_DEBUG', 'gc-friendly,fatal-warnings') test_env.set('GSETTINGS_BACKEND', 'memory') -test_env.set('GSETTINGS_SCHEMA_DIR', '@0@/data'.format(meson.build_root())) +test_env.set('GSETTINGS_SCHEMA_DIR', '@0@/data'.format(meson.project_build_root())) test_env.set('PYTHONDONTWRITEBYTECODE', 'yes') test_env.set('MALLOC_CHECK_', '2') test_env.set('XDG_CONFIG_HOME', meson.current_source_dir()) diff --git a/tests/services/meson.build b/tests/services/meson.build index 06a1f4f..a27bdf4 100644 --- a/tests/services/meson.build +++ b/tests/services/meson.build @@ -1,6 +1,6 @@ service_file = 'org.sigxcpu.Feedback.service' service_data = configuration_data() -service_data.set('ABS_BUILDDIR', meson.build_root()) +service_data.set('ABS_BUILDDIR', meson.project_build_root()) configure_file( input : service_file + '.in',