From ba2908aa2c28a50de84231e9f93ca9032f3eb608 Mon Sep 17 00:00:00 2001 From: Scott D Phillips Date: Wed, 26 Oct 2016 22:36:17 -0700 Subject: [PATCH] meson: don't add_global_arguments when being built as a subproject https://bugzilla.gnome.org/show_bug.cgi?id=773568 --- meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index a46df0c..04ba441 100644 --- a/meson.build +++ b/meson.build @@ -33,7 +33,9 @@ if cc.get_id() == 'msvc' # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it # If a warning is harmless but hard to fix, use '/woXXXX' so it's shown once # NOTE: Only add warnings here if you are sure they're spurious - add_global_arguments('/wd4018', '/wd4146', '/wd4244', '/wd4333', '/wd4996', language : 'c') + if not meson.is_subproject() + add_global_arguments('/wd4018', '/wd4146', '/wd4244', '/wd4333', '/wd4996', language : 'c') + endif # Disable SAFESEH with MSVC for plugins and libs that use external deps that # are built with MinGW noseh_link_args = ['/SAFESEH:NO'] -- 2.7.4