From 30ea94f40c0ada4d495c70f1ed34da680cc32c91 Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Cerveau?= <scerveau@collabora.com>
Date: Wed, 15 Jul 2020 15:46:49 +0200
Subject: [PATCH] meson: move custom_subproject definition for gst-full

In order to let any subproject to use gstreamer-full
declare the subprojects after gstreamer-full definition.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-build/-/merge_requests/203>
---
 meson.build | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/meson.build b/meson.build
index 99ce972..bafeea9 100644
--- a/meson.build
+++ b/meson.build
@@ -158,14 +158,6 @@ plugins_doc_dep = custom_target('plugins-doc-cache',
   capture: true,
 )
 
-foreach custom_subproj: get_option('custom_subprojects').split(',')
-    if custom_subproj != ''
-        message ('Adding custom subproject ' + custom_subproj)
-        subproject(custom_subproj)
-        subprojects_names += [custom_subproj]
-    endif
-endforeach
-
 if meson.is_cross_build() or build_machine.system() == 'windows'
     if get_option('doc').enabled()
         error('Documentation enabled but building the doc while cross building or building on windows is not supported yet.')
@@ -324,6 +316,14 @@ if get_option('default_library') == 'static'
     subdirs : 'gstreamer-1.0')
 endif
 
+foreach custom_subproj: get_option('custom_subprojects').split(',')
+    if custom_subproj != ''
+        message ('Adding custom subproject ' + custom_subproj)
+        subproject(custom_subproj)
+        subprojects_names += [custom_subproj]
+    endif
+endforeach
+
 message('Building subprojects: ' + ', '.join(subprojects_names))
 setenv = find_program('gst-env.py')
 
-- 
2.7.4