From e458ea2f3db32225f5d8d794ce8fe35dac9d825c Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 8 Jan 2019 14:46:46 +0000 Subject: [PATCH] build: Avoid a Meson deprecation warning Using an empty `configuration_data` object to copy a configuration file is deprecated since Meson 0.47 (released July 2018); the equivalent behaviour is available by using `copy: true`. --- meson.build | 2 +- testsuite/tools/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 53504f9279..93314fb628 100644 --- a/meson.build +++ b/meson.build @@ -7,7 +7,7 @@ project('gtk+', 'c', # https://github.com/mesonbuild/meson/issues/2289 'c_std=gnu99', ], - meson_version : '>= 0.43.0', + meson_version : '>= 0.48.0', license: 'LGPLv2.1+') glib_major_req = 2 diff --git a/testsuite/tools/meson.build b/testsuite/tools/meson.build index 837e94c6f8..f0cbb65948 100644 --- a/testsuite/tools/meson.build +++ b/testsuite/tools/meson.build @@ -8,7 +8,7 @@ if bash.found() foreach t : ['simplify', 'settings'] configure_file(output: t, input: '@0@.in'.format(t), - configuration: configuration_data(), + copy: true, install: get_option('install-tests'), install_dir: testexecdir) test(t, bash,