isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 17:10:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

meson: Do not install cogl config.env if installed tests are disabled

Browse Source 
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
This commit is contained in:
Marco Trevisan (Treviño) 2019-01-16 23:54:42 +01:00 committed by Marco Trevisan
parent b4ae6cdd62
commit dbe73c3296
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cogl/tests/meson.build
View File

@ -4,10 +4,17 @@ cdata = configuration_data()
cdata.set('HAVE_GL', have_gl.to_int()) cdata.set('HAVE_GL', have_gl.to_int())
cdata.set('HAVE_GLES2', have_gles2.to_int()) cdata.set('HAVE_GLES2', have_gles2.to_int())
cogl_installed_tests_libexecdir = join_paths( # Until meson 0.50 setting the install parameter in 'configure_file' is ignored
mutter_installed_tests_libexecdir, 'cogl', 'conform') # 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 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) install_data('run-tests.sh', install_dir: cogl_installed_tests_libexecdir)
endif endif