Commit 16af121a authored by Seungha Yang's avatar Seungha Yang

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

... to avoid mixing '/' and '\' in a path string on Windows.
parent 9a3e8ad2
...@@ -25,7 +25,7 @@ gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor) ...@@ -25,7 +25,7 @@ gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor)
api_version = '1.0' 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') cc = meson.get_compiler('c')
host_system = host_machine.system() host_system = host_machine.system()
......
...@@ -183,7 +183,7 @@ foreach t : good_tests ...@@ -183,7 +183,7 @@ foreach t : good_tests
env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs) env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs)
env.set('GSETTINGS_BACKEND', 'memory') 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, exe = executable(test_name, fname,
include_directories : [configinc], include_directories : [configinc],
c_args : ['-DHAVE_CONFIG_H=1' ] + test_defines, c_args : ['-DHAVE_CONFIG_H=1' ] + test_defines,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment