mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 00:36:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: move custom_subproject definition for gst-full

Browse source 
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>
This commit is contained in:
Stéphane Cerveau 2020-07-15 15:46:49 +02:00
parent e7b9f6b04a
commit 30ea94f40c
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
meson.build
View file

@ -158,14 +158,6 @@ plugins_doc_dep = custom_target('plugins-doc-cache',
capture: true, 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 meson.is_cross_build() or build_machine.system() == 'windows'
if get_option('doc').enabled() if get_option('doc').enabled()
error('Documentation enabled but building the doc while cross building or building on windows is not supported yet.') 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') subdirs : 'gstreamer-1.0')
endif 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)) message('Building subprojects: ' + ', '.join(subprojects_names))
setenv = find_program('gst-env.py') setenv = find_program('gst-env.py')