From: Carl Hetherington <cth@carlh.net>
Date: Mon, 5 Feb 2024 17:52:41 +0000 (+0100)
Subject: Some new warning-disable flags are not allowed with the 2.16.x Xcode.
X-Git-Tag: v2.16.75~8
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=0e913c18035494f19b0869951989d76f73bb910b

Some new warning-disable flags are not allowed with the 2.16.x Xcode.
---

diff --git a/wscript b/wscript
index 8313a1f70..a06d96e89 100644
--- a/wscript
+++ b/wscript
@@ -79,6 +79,7 @@ def options(opt):
     opt.add_option('--warnings-are-errors', action='store_true', default=False, help='build with -Werror')
     opt.add_option('--wx-config',         help='path to wx-config')
     opt.add_option('--enable-asan',       action='store_true', help='build with asan')
+    opt.add_option('--disable-more-warnings', action='store_true', default=False, help='disable some warnings raised by Xcode 15 with the 2.16 branch')
 
 def configure(conf):
     conf.load('compiler_cxx')
@@ -110,19 +111,21 @@ def configure(conf):
                                        '-Wall',
                                        '-Wextra',
                                        '-Wwrite-strings',
-                                       # These next 5 are for Xcode 15.0.1 with the v2.16.x-era
-                                       # dependencies; maybe they aren't necessary when building
-                                       # v2.1{7,8}.x
-                                       '-Wno-error=deprecated',
-                                       '-Wno-deprecated-builtins',
-                                       '-Wno-deprecated-declarations',
-                                       '-Wno-enum-constexpr-conversion',
-                                       '-Wno-deprecated-copy',
                                        # I tried and failed to ignore these with _Pragma
                                        '-Wno-ignored-qualifiers',
                                        '-D_FILE_OFFSET_BITS=64',
                                        '-std=c++11'])
 
+    if conf.options.disable_more_warnings:
+        # These are for Xcode 15.0.1 with the v2.16.x-era
+        # dependencies; maybe they aren't necessary when building
+        # v2.1{7,8}.x
+        conf.env.append_value('CXXFLAGS', ['-Wno-error=deprecated',
+                                           '-Wno-deprecated-builtins',
+                                           '-Wno-deprecated-declarations',
+                                           '-Wno-enum-constexpr-conversion',
+                                           '-Wno-deprecated-copy'])
+
     if conf.options.warnings_are_errors:
         conf.env.append_value('CXXFLAGS', '-Werror')