diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-08-30 21:15:25 -0400 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2022-08-31 13:23:56 +0000 |
| commit | fe40a7397342c962d5937b8bbf3c109d15378b3b (patch) | |
| tree | 1ec2e9fd6f58f31bbfb6a62c563b319035dd9791 /meson.build | |
| parent | cbc676119957c12635e8798fc29a420a09eff88e (diff) | |
| download | gstreamer-fe40a7397342c962d5937b8bbf3c109d15378b3b.tar.gz | |
meson: Make sure devenv uses tools linked on gst-full
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2959>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 3967832f92..e338a11eea 100644 --- a/meson.build +++ b/meson.build @@ -261,7 +261,14 @@ pathsep = host_machine.system() == 'windows' ? ';' : ':' all_plugins_paths = pathsep.join(all_plugins_paths) devenv = environment() -devenv.prepend('GST_PLUGIN_PATH', all_plugins_dirs) +if not building_full + devenv.prepend('GST_PLUGIN_PATH', all_plugins_dirs) +else + # Make sure the current build directory is first in PATH so we prefer tools + # built here that links on gst-full instead instead of those built in + # subprojects. + devenv.prepend('PATH', meson.current_build_dir()) +endif devenv.set('CURRENT_GST', meson.current_source_dir()) devenv.set('GST_VERSION', meson.project_version()) devenv.set('GST_ENV', 'gst-' + meson.project_version()) |