Commit dbe73c32 authored by Marco Trevisan's avatar Marco Trevisan 🎺 Committed by Marco Trevisan

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
parent b4ae6cdd
Pipeline #56115 passed with stages
in 6 minutes and 7 seconds
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment