diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2019-01-16 23:54:42 +0100 |
|---|---|---|
| committer | Marco Trevisan <mail@3v1n0.net> | 2019-02-04 15:49:56 +0000 |
| commit | dbe73c3296b2818520606882961092c394d34f94 (patch) | |
| tree | 7ec2808b118b3f3fe4c3bdf971347505f66eb1b9 | |
| parent | b4ae6cdd622024e773ec33c13e31c2fb2cc14991 (diff) | |
| download | mutter-dbe73c3296b2818520606882961092c394d34f94.tar.gz | |
meson: Do not install cogl config.env if installed tests are disabled
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
| -rw-r--r-- | cogl/tests/meson.build | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cogl/tests/meson.build b/cogl/tests/meson.build index 784bd7d26..5284fe69f 100644 --- a/cogl/tests/meson.build +++ b/cogl/tests/meson.build @@ -4,10 +4,17 @@ cdata = configuration_data() cdata.set('HAVE_GL', have_gl.to_int()) cdata.set('HAVE_GLES2', have_gles2.to_int()) -cogl_installed_tests_libexecdir = join_paths( - mutter_installed_tests_libexecdir, 'cogl', 'conform') +# 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 |