meson: Use join_paths() instead '/'

This commit is contained in:
Seungha Yang 2018-12-18 22:48:42 +09:00
parent f89fc3441b
commit 380b8d8e7f
2 changed files with 2 additions and 1 deletions

View file

@ -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

View file

@ -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