projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2e69cc0
)
Some new warning-disable flags are not allowed with the 2.16.x Xcode.
author
Carl Hetherington
<cth@carlh.net>
Mon, 5 Feb 2024 17:52:41 +0000
(18:52 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 5 Feb 2024 17:52:41 +0000
(18:52 +0100)
wscript
patch
|
blob
|
history
diff --git
a/wscript
b/wscript
index 8313a1f705999e2515a0dd8c876dfe7519f02036..a06d96e8935a5e8df57e388f05ae08dd6a906c1b 100644
(file)
--- 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('--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')
def configure(conf):
conf.load('compiler_cxx')
@@
-110,19
+111,21
@@
def configure(conf):
'-Wall',
'-Wextra',
'-Wwrite-strings',
'-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'])
# 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')
if conf.options.warnings_are_errors:
conf.env.append_value('CXXFLAGS', '-Werror')