From 16af121a86e5b792b21129c820b32dc67b1c8ede Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Tue, 18 Dec 2018 20:39:40 +0900 Subject: [PATCH] meson: Prefer to use join_paths() over '/' ... to avoid mixing '/' and '\' in a path string on Windows. --- meson.build | 2 +- tests/check/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 6d57205..f3f8800 100644 --- a/meson.build +++ b/meson.build @@ -25,7 +25,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') host_system = host_machine.system() diff --git a/tests/check/meson.build b/tests/check/meson.build index 2cb1262..c4e0c8d 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -183,7 +183,7 @@ foreach t : good_tests env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs) env.set('GSETTINGS_BACKEND', 'memory') - 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))) exe = executable(test_name, fname, include_directories : [configinc], c_args : ['-DHAVE_CONFIG_H=1' ] + test_defines, -- 2.7.4