mirror of
https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
synced 2024-05-12 21:32:39 +00:00
Merge branch 'fix-missing-wrapped-dependencies' into 'main'
Draft: meson: Make any Meson-provided dependencies available to cargo Closes #512 See merge request gstreamer/gst-plugins-rs!1495
This commit is contained in:
commit
f21a28dcae
16
meson.build
16
meson.build
|
@ -472,12 +472,18 @@ if pkg_config.found()
|
|||
extra_env += {'PKG_CONFIG': pkg_config.full_path()}
|
||||
endif
|
||||
|
||||
pkg_config_path = get_option('pkg_config_path')
|
||||
# Prepend any Meson-provided dependencies (such as the GStreamer
|
||||
# global project's)
|
||||
pkg_config_path = [
|
||||
meson.global_build_root() / 'meson-uninstalled',
|
||||
meson.project_build_root() / 'meson-uninstalled',
|
||||
]
|
||||
if get_option('pkg_config_path').length() > 0
|
||||
pkg_config_path += [get_option('pkg_config_path')]
|
||||
endif
|
||||
|
||||
if pkg_config_path.length() > 0
|
||||
pathsep = ':'
|
||||
if host_system == 'windows'
|
||||
pathsep = ';'
|
||||
endif
|
||||
pathsep = host_system == 'windows' ? ';' : ':'
|
||||
extra_env += {'PKG_CONFIG_PATH': pathsep.join(pkg_config_path)}
|
||||
endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue