From fe40a7397342c962d5937b8bbf3c109d15378b3b Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 30 Aug 2022 21:15:25 -0400 Subject: [PATCH] meson: Make sure devenv uses tools linked on gst-full Part-of: --- meson.build | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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())