[gtk/build-warning] build: Do not use `install` argument for configure_file()
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/build-warning] build: Do not use `install` argument for configure_file()
- Date: Fri, 29 Mar 2019 14:31:35 +0000 (UTC)
commit ba3a502079b426cf2b85df7fd14829681abce2d9
Author: Emmanuele Bassi <ebassi gnome org>
Date: Fri Mar 29 13:59:58 2019 +0000
build: Do not use `install` argument for configure_file()
The `install` argument for configure_file() was introduced in Meson
0.50, and was ignored in earlier versions.
Since we're still using Meson 0.48 as a baseline, and since it doesn't
cost us nothing to use a conditional in the only place where we used the
`install` argument, let's drop it. This avoids a warning in newer
releases of Meson.
testsuite/tools/meson.build | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/testsuite/tools/meson.build b/testsuite/tools/meson.build
index f0cbb65948..74a79901a9 100644
--- a/testsuite/tools/meson.build
+++ b/testsuite/tools/meson.build
@@ -6,11 +6,16 @@ if bash.found()
test_env = environment()
foreach t : ['simplify', 'settings']
- configure_file(output: t,
- input: '@0@.in'.format(t),
- copy: true,
- install: get_option('install-tests'),
- install_dir: testexecdir)
+ if get_option('install-tests')
+ configure_file(output: t,
+ input: '@0@.in'.format(t),
+ copy: true,
+ install_dir: testexecdir)
+ else
+ configure_file(output: t,
+ input: '@0@.in'.format(t),
+ copy: true)
+ endif
test(t, bash,
args: t,
workdir: meson.current_build_dir(),
@@ -35,7 +40,6 @@ if get_option('install-tests')
configure_file(output: '@0@.test'.format(t),
input: 'tools.test.in',
configuration: test_conf,
- install: true,
install_dir: testdatadir)
endforeach
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]