From 6cd6d3aa1609c424b0a7f768876781b836f6e373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 24 Apr 2019 07:35:12 +0200 Subject: [PATCH] Also disable C and C++ specific warnings in thirdparty code Move the `Append` up to make sure that the keys exist and avoid the need to check `if CPPFLAGS in self`, etc. (cherry picked from commit 8d867cf7c5fb4ce0e78b9b62c64d194fdf666874) --- methods.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/methods.py b/methods.py index ec9ecdb17fb..11551a51d22 100644 --- a/methods.py +++ b/methods.py @@ -24,10 +24,16 @@ def disable_warnings(self): # We have to remove existing warning level defines before appending /w, # otherwise we get: "warning D9025 : overriding '/W3' with '/w'" warn_flags = ['/Wall', '/W4', '/W3', '/W2', '/W1', '/WX'] - self['CCFLAGS'] = [x for x in self['CCFLAGS'] if not x in warn_flags] self.Append(CCFLAGS=['/w']) + self.Append(CFLAGS=['/w']) + self.Append(CPPFLAGS=['/w']) + self['CCFLAGS'] = [x for x in self['CCFLAGS'] if not x in warn_flags] + self['CFLAGS'] = [x for x in self['CFLAGS'] if not x in warn_flags] + self['CPPFLAGS'] = [x for x in self['CPPFLAGS'] if not x in warn_flags] else: self.Append(CCFLAGS=['-w']) + self.Append(CFLAGS=['-w']) + self.Append(CPPFLAGS=['-w']) def add_module_version_string(self,s):