diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2019-05-21 12:26:47 -0500 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2019-05-21 12:36:15 -0500 |
| commit | 9305b6d8eeccd0ea1f173d035ed7d8e8c008ee8b (patch) | |
| tree | 3282c487418afff6cfb834c5d62965ccc1007316 | |
| parent | 62de4b4f82a6b5dadc07a04fe3558f1c0111fbdb (diff) | |
| download | mutter-9305b6d8eeccd0ea1f173d035ed7d8e8c008ee8b.tar.gz | |
cogl/tests: Remove configure_file workaround for installed tests
Since starting meson 0.50 `install: false` is honored when the install_dir is
set to a non-empty value, we can now remove the workaround we added in commit
dbe73c329
https://gitlab.gnome.org/GNOME/mutter/merge_requests/585
| -rw-r--r-- | cogl/tests/meson.build | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/cogl/tests/meson.build b/cogl/tests/meson.build index 5284fe69f..4bb186424 100644 --- a/cogl/tests/meson.build +++ b/cogl/tests/meson.build @@ -4,19 +4,9 @@ cdata = configuration_data() cdata.set('HAVE_GL', have_gl.to_int()) cdata.set('HAVE_GLES2', have_gles2.to_int()) -# Until meson 0.50 setting the install parameter in 'configure_file' is ignored -# if 'install_dir' is set, then until mutter doesn't depend on such meson version -# cogl_installed_tests_libexecdir should be empty unless have_installed_tests -# is false, or this file will be installed anyway. -# -# See https://github.com/mesonbuild/meson/issues/4160 -cogl_installed_tests_libexecdir = '' - -if have_installed_tests - cogl_installed_tests_libexecdir = join_paths( - mutter_installed_tests_libexecdir, 'cogl', 'conform') - install_data('run-tests.sh', install_dir: cogl_installed_tests_libexecdir) -endif +cogl_installed_tests_libexecdir = join_paths( + mutter_installed_tests_libexecdir, 'cogl', 'conform') +install_data('run-tests.sh', install_dir: cogl_installed_tests_libexecdir) cogl_config_env = configure_file( input: 'config.env.in', |