AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-14 20:51:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'build-warning' into 'master'

Browse Source 
build: Do not use `install` argument for configure_file()

See merge request GNOME/gtk!681
This commit is contained in:
Emmanuele Bassi 2019-03-29 14:47:28 +00:00
commit 5261bc6585
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