mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-30 04:00:37 +00:00
meson: Do not modify default value of -Dtools for subprojects
See: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1136 Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2166>
This commit is contained in:
parent
139c332911
commit
032ff74e5a
1 changed files with 5 additions and 5 deletions
10
meson.build
10
meson.build
|
@ -77,15 +77,15 @@ if not meson.is_subproject() and cc.get_id() == 'msvc'
|
|||
endif
|
||||
|
||||
building_full = get_option('default_library') == 'static'
|
||||
tools_option = 'tools=auto'
|
||||
tools_option = []
|
||||
if building_full and not get_option('tools').disabled()
|
||||
# Do not build subprojects tools when we build them against gst-full
|
||||
tools_option = 'tools=disabled'
|
||||
tools_option = ['tools=disabled']
|
||||
endif
|
||||
|
||||
# Ordered list of subprojects (dict has no ordering guarantees)
|
||||
subprojects = [
|
||||
['gstreamer', {'build-hotdoc': true, 'subproject_options': [tools_option]}],
|
||||
['gstreamer', {'build-hotdoc': true, 'subproject_options': tools_option}],
|
||||
['gst-plugins-base', {'option': get_option('base'), 'build-hotdoc': true}],
|
||||
['gst-plugins-good', {'option': get_option('good'), 'build-hotdoc': true}],
|
||||
['libnice', { 'option': get_option('libnice'), 'match_gst_version': false}],
|
||||
|
@ -93,9 +93,9 @@ subprojects = [
|
|||
['gst-plugins-ugly', { 'option': get_option('ugly'), 'build-hotdoc': true}],
|
||||
['gst-libav', { 'option': get_option('libav'), 'build-hotdoc': true}],
|
||||
['gst-rtsp-server', { 'option': get_option('rtsp_server'), 'build-hotdoc': true}],
|
||||
['gst-devtools', { 'option': get_option('devtools'), 'build-hotdoc': true, 'subproject_options': [tools_option]}],
|
||||
['gst-devtools', { 'option': get_option('devtools'), 'build-hotdoc': true, 'subproject_options': tools_option}],
|
||||
['gst-integration-testsuites', { 'option': get_option('devtools') }],
|
||||
['gst-editing-services', { 'option': get_option('ges'), 'build-hotdoc': true, 'subproject_options': [tools_option]}],
|
||||
['gst-editing-services', { 'option': get_option('ges'), 'build-hotdoc': true, 'subproject_options': tools_option}],
|
||||
['gstreamer-vaapi', { 'option': get_option('vaapi'), 'build-hotdoc': true}],
|
||||
['gst-omx', { 'option': get_option('omx'), 'build-hotdoc': true}],
|
||||
['gstreamer-sharp', { 'option': get_option('sharp') }],
|
||||
|
|
Loading…
Reference in a new issue