Merge pull request #465 from michaelbadcrumble/meson_support

Keep Meson support back to 0.50.0:
This commit is contained in:
Mark VanderVoord
2019-12-04 06:02:32 -05:00
committed by GitHub

View File

@ -13,13 +13,8 @@
project('unity', 'c', project('unity', 'c',
license : 'MIT', license : 'MIT',
meson_version : '>=0.52.0', meson_version : '>=0.50.0',
default_options: [ default_options: ['warning_level=3', 'werror=true', 'c_std=c11']
'buildtype=minsize',
'optimization=3',
'warning_level=3',
'werror=true',
]
) )
lang = 'c' lang = 'c'
cc = meson.get_compiler(lang) cc = meson.get_compiler(lang)
@ -33,8 +28,10 @@ cc = meson.get_compiler(lang)
if cc.get_id() == 'clang' if cc.get_id() == 'clang'
add_project_arguments(cc.get_supported_arguments( add_project_arguments(cc.get_supported_arguments(
[ [
'-Wweak-vtables', '-Wexit-time-destructors', '-Wcast-qual', '-Wshadow', '-Wcast-align', '-Wweak-vtables',
'-Wglobal-constructors', '-Wmissing-noreturn' '-Wold-style-cast', '-Wpointer-arith', '-Wconversion',
'-Wexit-time-destructors', '-Wglobal-constructors',
'-Wmissing-noreturn', '-Wmissing-prototypes', '-Wno-missing-braces'
] ]
), language: lang) ), language: lang)
endif endif
@ -42,14 +39,14 @@ endif
if cc.get_argument_syntax() == 'gcc' if cc.get_argument_syntax() == 'gcc'
add_project_arguments(cc.get_supported_arguments( add_project_arguments(cc.get_supported_arguments(
[ [
'-Wformat', '-Waddress', '-Winit-self', '-Wno-multichar', '-Wformat', '-Waddress', '-Winit-self', '-Wno-multichar',
'-Wpointer-arith' , '-Wwrite-strings' , '-Wpointer-arith' , '-Wwrite-strings' ,
'-Wno-parentheses' , '-Wno-type-limits' , '-Wno-parentheses' , '-Wno-type-limits' ,
'-Wformat-security' , '-Wunreachable-code' , '-Wformat-security' , '-Wunreachable-code' ,
'-Waggregate-return' , '-Wformat-nonliteral' , '-Waggregate-return' , '-Wformat-nonliteral' ,
'-Wmissing-prototypes' , '-Wold-style-definition' , '-Wmissing-prototypes' , '-Wold-style-definition' ,
'-Wmissing-declarations', '-Wmissing-include-dirs' , '-Wmissing-declarations', '-Wmissing-include-dirs' ,
'-Wno-unused-parameter' , '-Wdeclaration-after-statement' '-Wno-unused-parameter' , '-Wdeclaration-after-statement'
] ]
), language: lang) ), language: lang)
endif endif
@ -57,9 +54,9 @@ endif
if cc.get_id() == 'msvc' if cc.get_id() == 'msvc'
add_project_arguments(cc.get_supported_arguments( add_project_arguments(cc.get_supported_arguments(
[ [
'/w44265', '/w44061', '/w44062', '/w44265', '/w44061', '/w44062',
'/wd4018', '/wd4146', '/wd4244', '/wd4018', '/wd4146', '/wd4244',
'/wd4305', '/wd4305', '/D _CRT_SECURE_NO_WARNINGS'
] ]
), language: lang) ), language: lang)
endif endif