mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 19:21:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Don't use add_global_arguments when a subproject

Browse source 
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:
Nirbheek Chauhan 2021-08-30 17:23:05 +05:30
parent 06869815fd
commit c99e3b312a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -59,8 +59,10 @@ if not meson.is_subproject() and cc.get_id() == 'msvc'
endif endif
endif endif
# Ensure that MSVC interprets all source code as UTF-8 # Ensure that MSVC interprets all source code as UTF-8. Only do this when we're
if cc.get_id() == 'msvc' # 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( add_global_arguments(
cc.get_supported_arguments(['/utf-8']), # set the input encoding to utf-8 cc.get_supported_arguments(['/utf-8']), # set the input encoding to utf-8
language: ['c', 'cpp']) language: ['c', 'cpp'])