mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-16 13:00:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Prefer to use join_paths() over '/'

Browse source 
... to avoid mixing '/' and '\' in a path string on Windows.
This commit is contained in:
Seungha Yang 2018-12-18 21:16:43 +09:00 committed by Tim-Philipp Müller
parent f74ad82ddc
commit 1b0b2c37cc
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -27,7 +27,7 @@ curversion = gst_version_minor * 100 + gst_version_micro
libversion = '@0@.@1@.0'.format(soversion, curversion)
osxversion = curversion + 1
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')
cxx = meson.get_compiler('cpp')

2
tests/check/meson.build
View file

@ -138,7 +138,7 @@ foreach t : base_tests
env.set('CK_DEFAULT_TIMEOUT', '20')
env.set('GST_STATE_IGNORE_ELEMENTS', '')
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)))
env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer', 'gst-plugins-base',
'gst-plugins-good', 'gst-plugins-ugly','gst-libav',
'gst-plugins-bad@' + meson.build_root())