diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2019-03-29 14:47:28 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2019-03-29 14:47:28 +0000 |
| commit | 5261bc65859ecffee01b1b8033678e7623ae43cb (patch) | |
| tree | 11644c7df51e78a45460196d57ab721576324d37 | |
| parent | 7c369f309a97a7dab58b76c4c9c92e496b43bc97 (diff) | |
| parent | ba3a502079b426cf2b85df7fd14829681abce2d9 (diff) | |
| download | gtk+-5261bc65859ecffee01b1b8033678e7623ae43cb.tar.gz | |
Merge branch 'build-warning' into 'master'
build: Do not use `install` argument for configure_file()
See merge request GNOME/gtk!681
| -rw-r--r-- | testsuite/tools/meson.build | 16 |
1 files 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 |