diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2019-01-08 14:59:21 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2019-01-08 14:59:21 +0000 |
| commit | b3f8f358b58541edff6a7e1875a3553239507e6d (patch) | |
| tree | 923a23bd1300287bfb87b45c3c776f0e10955e25 | |
| parent | b6d8d3975edc29cb5488990d0a39e3d2c4790d89 (diff) | |
| parent | e458ea2f3db32225f5d8d794ce8fe35dac9d825c (diff) | |
| download | gtk+-b3f8f358b58541edff6a7e1875a3553239507e6d.tar.gz | |
Merge branch 'meson-warning' into 'master'
build: Avoid a Meson deprecation warning
See merge request GNOME/gtk!493
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | testsuite/tools/meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 53504f9279..93314fb628 100644 --- a/meson.build +++ b/meson.build @@ -7,7 +7,7 @@ project('gtk+', 'c', # https://github.com/mesonbuild/meson/issues/2289 'c_std=gnu99', ], - meson_version : '>= 0.43.0', + meson_version : '>= 0.48.0', license: 'LGPLv2.1+') glib_major_req = 2 diff --git a/testsuite/tools/meson.build b/testsuite/tools/meson.build index 837e94c6f8..f0cbb65948 100644 --- a/testsuite/tools/meson.build +++ b/testsuite/tools/meson.build @@ -8,7 +8,7 @@ if bash.found() foreach t : ['simplify', 'settings'] configure_file(output: t, input: '@0@.in'.format(t), - configuration: configuration_data(), + copy: true, install: get_option('install-tests'), install_dir: testexecdir) test(t, bash, |