From 380b8d8e7f710100dc6b22d1cc0426c8159bdadd Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Tue, 18 Dec 2018 22:48:42 +0900 Subject: [PATCH] meson: Use join_paths() instead '/' --- meson.build | 2 +- tests/check/meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index e670015..5040c45 100644 --- a/meson.build +++ b/meson.build @@ -23,7 +23,7 @@ gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor) api_version = '1.0' -plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir')) +plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0') cc = meson.get_compiler('c') if have_cxx diff --git a/tests/check/meson.build b/tests/check/meson.build index d7678c9..93ad5e7 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -70,6 +70,7 @@ foreach t : ugly_tests 'gst-plugins-good', 'gst-plugins-ugly@' + meson.build_root()) env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs) env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name)) + env.set('GST_REGISTRY', join_paths(meson.current_build_dir(), '@0@.registry'.format(test_name))) test(test_name, exe, env: env, timeout: 3 * 60) endif endforeach -- 2.7.4