mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-14 20:51:07 +00:00
Merge branch 'build-warning' into 'master'
build: Do not use `install` argument for configure_file() See merge request GNOME/gtk!681
This commit is contained in:
commit
5261bc6585
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user