From ad2216b4c8276f900fcc51e6c135f3c9abde2a4f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 9 Sep 2020 11:26:25 +1000 Subject: [PATCH] meson.build: bump minimum version to 0.47 It's been out for 2 years. Signed-off-by: Peter Hutterer --- doc/api/meson.build | 10 +--------- doc/user/meson.build | 9 +-------- meson.build | 2 +- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/doc/api/meson.build b/doc/api/meson.build index 86ca2073..b5018e65 100644 --- a/doc/api/meson.build +++ b/doc/api/meson.build @@ -26,19 +26,11 @@ src_doxygen = files( 'style/libinputdoxygen.css', ) -config_noop = configuration_data() -# Set a dummy replacement to silence meson warnings: -# meson.build:487: WARNING: Got an empty configuration_data() object and -# found no substitutions in the input file 'foo'. If you -# want to copy a file to the build dir, use the 'copy:' -# keyword argument added in 0.47.0 -config_noop.set('dummy', 'dummy') - doxyfiles = [] foreach f : src_doxygen df = configure_file(input: f, output: '@PLAINNAME@', - configuration : config_noop) + copy : true) doxyfiles += [ df ] endforeach diff --git a/doc/user/meson.build b/doc/user/meson.build index 733e1b90..d2c0eb00 100644 --- a/doc/user/meson.build +++ b/doc/user/meson.build @@ -168,18 +168,11 @@ src_rst = files( 'configuration.rst', ) -config_noop = configuration_data() -# Set a dummy replacement to silence meson warnings: -# meson.build:487: WARNING: Got an empty configuration_data() object and -# found no substitutions in the input file 'foo'. If you -# want to copy a file to the build dir, use the 'copy:' -# keyword argument added in 0.47.0 -config_noop.set('dummy', 'dummy') src_sphinx = [] foreach f : src_rst sf = configure_file(input: f, output: '@PLAINNAME@', - configuration : config_noop) + copy : true) src_sphinx += [ sf ] endforeach diff --git a/meson.build b/meson.build index f0f7b237..5c8bf1b3 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project('libinput', 'c', version : '1.16.900', license : 'MIT/Expat', default_options : [ 'c_std=gnu99', 'warning_level=2' ], - meson_version : '>= 0.45.0') + meson_version : '>= 0.47.0') libinput_version = meson.project_version().split('.')