AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

build: Do not use install argument for configure_file()

Browse Source 
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.
This commit is contained in:
Emmanuele Bassi 2019-03-29 13:59:58 +00:00
parent ec9be21771
commit ba3a502079
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
testsuite/tools/meson.build
View File

@ -6,11 +6,16 @@ if bash.found()
test_env = environment() test_env = environment()
foreach t : ['simplify', 'settings'] foreach t : ['simplify', 'settings']
configure_file(output: t, if get_option('install-tests')
input: '@0@.in'.format(t), configure_file(output: t,
copy: true, input: '@0@.in'.format(t),
install: get_option('install-tests'), copy: true,
install_dir: testexecdir) install_dir: testexecdir)
else
configure_file(output: t,
input: '@0@.in'.format(t),
copy: true)
endif
test(t, bash, test(t, bash,
args: t, args: t,
workdir: meson.current_build_dir(), workdir: meson.current_build_dir(),
@ -35,7 +40,6 @@ if get_option('install-tests')
configure_file(output: '@0@.test'.format(t), configure_file(output: '@0@.test'.format(t),
input: 'tools.test.in', input: 'tools.test.in',
configuration: test_conf, configuration: test_conf,
install: true,
install_dir: testdatadir) install_dir: testdatadir)
endforeach endforeach