mirror of
https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
synced 2024-09-27 14:30:27 +00:00
meson: fix PKG_CONFIG_PATH
pkg-config files are now ll in 'build/meson-uninstalled'. Fix https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4 Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/415>
This commit is contained in:
parent
ad90efc508
commit
d16e7d1213
1 changed files with 1 additions and 8 deletions
|
@ -15,15 +15,8 @@ cargo_target_dir = os.path.join(meson_build_dir, 'target')
|
||||||
env = os.environ.copy()
|
env = os.environ.copy()
|
||||||
env['CARGO_TARGET_DIR'] = cargo_target_dir
|
env['CARGO_TARGET_DIR'] = cargo_target_dir
|
||||||
|
|
||||||
# FIXME: hack so cargo will find gst libs when building inside gst-build.
|
|
||||||
# We should fetch this from meson deps instead of hardcoding the paths,
|
|
||||||
# when Meson will generate -uninstalled.pc files, they all will be in
|
|
||||||
# <meson_build_root>/meson-uninstalled/
|
|
||||||
pkg_config_path = env.get('PKG_CONFIG_PATH', '').split(':')
|
pkg_config_path = env.get('PKG_CONFIG_PATH', '').split(':')
|
||||||
pkg_config_path.append(os.path.join(
|
pkg_config_path.append(os.path.join(meson_build_root, 'meson-uninstalled'))
|
||||||
meson_build_root, 'subprojects', 'gstreamer', 'pkgconfig'))
|
|
||||||
pkg_config_path.append(os.path.join(
|
|
||||||
meson_build_root, 'subprojects', 'gst-plugins-base', 'pkgconfig'))
|
|
||||||
env['PKG_CONFIG_PATH'] = ':'.join(pkg_config_path)
|
env['PKG_CONFIG_PATH'] = ':'.join(pkg_config_path)
|
||||||
|
|
||||||
if len(extra_env) > 0:
|
if len(extra_env) > 0:
|
||||||
|
|
Loading…
Reference in a new issue