diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-04-13 00:33:03 +0530 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2022-09-27 20:38:55 +0000 |
| commit | 032ff74e5a3bc58e561cffbcaa4b092927501134 (patch) | |
| tree | b18b0c1ae3af44c93dc8f59c10c1e0b4a459be81 /meson.build | |
| parent | 139c332911792f4faa87566e5f26edb3cea8db51 (diff) | |
| download | gstreamer-032ff74e5a3bc58e561cffbcaa4b092927501134.tar.gz | |
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>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meson.build b/meson.build index b762870ebc..ca1e32d46d 100644 --- a/meson.build +++ b/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') }], |