mirror of
https://github.com/brl/mutter.git
synced 2024-11-21 15:40:41 -05:00
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
This commit is contained in:
parent
62de4b4f82
commit
9305b6d8ee
@ -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',
|
||||
|
Loading…
Reference in New Issue
Block a user