[mutter] cogl/tests: Remove configure_file workaround for installed tests



commit 9305b6d8eeccd0ea1f173d035ed7d8e8c008ee8b
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date:   Tue May 21 12:26:47 2019 -0500

    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

 cogl/tests/meson.build | 16 +++-------------
 1 file 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',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]