mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-22 08:17:01 +00:00
meson: Don't use add_global_arguments when a subproject
This is the correct fix for https://gitlab.freedesktop.org/gstreamer/gst-build/-/merge_requests/236 Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-build/-/merge_requests/259>
This commit is contained in:
parent
06869815fd
commit
c99e3b312a
1 changed files with 4 additions and 2 deletions
|
@ -59,8 +59,10 @@ if not meson.is_subproject() and cc.get_id() == 'msvc'
|
|||
endif
|
||||
endif
|
||||
|
||||
# Ensure that MSVC interprets all source code as UTF-8
|
||||
if cc.get_id() == 'msvc'
|
||||
# Ensure that MSVC interprets all source code as UTF-8. Only do this when we're
|
||||
# not a subproject, because subprojects are not allowed to call
|
||||
# add_global_arguments().
|
||||
if not meson.is_subproject() and cc.get_id() == 'msvc'
|
||||
add_global_arguments(
|
||||
cc.get_supported_arguments(['/utf-8']), # set the input encoding to utf-8
|
||||
language: ['c', 'cpp'])
|
||||
|
|
Loading…
Reference in a new issue