Merge pull request #321 from michaelbrockus/let_meson_handle_flags

Letting Meson handle flags

meson.build

@@ -8,46 +8,10 @@ project('cmock', 'c',
     license: 'MIT',
     meson_version: '>=0.53.0',
     subproject_dir : 'vendor',
-    default_options: ['layout=flat', 'warning_level=3', 'werror=true', 'c_std=c11']
+    default_options: ['werror=true', 'c_std=c11']
 )
-lang = 'c'
-cc = meson.get_compiler(lang)
-
-
-#
-# Meson: Add compiler flags
-#
-if cc.get_id() == 'clang'
-    add_project_arguments(cc.get_supported_arguments(
-            [
-                '-Wexit-time-destructors',
-                '-Wglobal-constructors',
-                '-Wmissing-prototypes',
-                '-Wmissing-noreturn',
-                '-Wno-missing-braces',
-                '-Wold-style-cast', '-Wpointer-arith', '-Wweak-vtables',
-                '-Wcast-align', '-Wconversion', '-Wcast-qual', '-Wshadow'
-            ]
-        ), language: lang)
-endif
-
-if cc.get_argument_syntax() == 'gcc'
-    add_project_arguments(cc.get_supported_arguments(
-            [
-                '-Wformat', '-Waddress', '-Winit-self', '-Wno-multichar',
-                '-Wpointer-arith'       , '-Wwrite-strings'              ,
-                '-Wno-parentheses'      , '-Wno-type-limits'             ,
-                '-Wformat-security'     , '-Wunreachable-code'           ,
-                '-Waggregate-return'    , '-Wformat-nonliteral'          ,
-                '-Wmissing-declarations', '-Wmissing-include-dirs'       ,
-                '-Wno-unused-parameter'
-            ]
-        ), language: lang)
-endif
 
 unity_dep = dependency('unity', fallback: ['unity', 'unity_dep'])
 
-#
-# Sub directory to project source code
 subdir('src')
 cmock_dep = declare_dependency(link_with: cmock_lib, include_directories: cmock_dir)

src/meson.build

@@ -7,6 +7,6 @@
 cmock_dir = include_directories('.')
 
 cmock_lib = static_library(meson.project_name(), 
-    sources: ['cmock.c'],
+    files('cmock.c'),
     dependencies: [unity_dep],
     include_directories: cmock_dir)