summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2021-08-30 17:21:44 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2021-08-30 17:21:44 +0530
commit06869815fd55017b63b54b89c276ec75e87d864c (patch)
tree272853c8cdd9bf43f38ef0f28adcfa2a5ee1779b
parenta31e9dcf4304bb036866fa4d2f4c3a4d99f7ced8 (diff)
Revert "Meson: Avoid using add_global_arguments() when gst-build is a subproject"
This reverts commit ebcca1e5ead27cab1eafc028332b1984c84b10b2. /utf-8 is needed to deal with subprojects that we do not control. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-build/-/merge_requests/259>
-rw-r--r--meson.build7
1 files changed, 7 insertions, 0 deletions
diff --git a/meson.build b/meson.build
index 5c76626..04ec9a9 100644
--- a/meson.build
+++ b/meson.build
@@ -59,6 +59,13 @@ 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'
+ add_global_arguments(
+ cc.get_supported_arguments(['/utf-8']), # set the input encoding to utf-8
+ language: ['c', 'cpp'])
+endif
+
# Ordered list of subprojects (dict has no ordering guarantees)
subprojects = [
['gstreamer', {'build-hotdoc': true}],