Merge pull request #19 from michaelbrockus/let_meson_handle_handle_flags

Let meson handle handle flags
ThrowTheSwitch · Jan 11, 2021 · 28c7214 · 28c7214
2 parents 1b66ad1 + de9be4c
commit 28c7214
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 38 deletions.
diff --git a/lib/meson.build b/lib/meson.build
@@ -7,5 +7,5 @@
 cexception_dir = include_directories('.')
 
 cexception_lib = static_library(meson.project_name(), 
-    sources: ['CException.c'],
-    include_directories: cexception_dir)
+    files('CException.c'),
+    include_directories : cexception_dir)
diff --git a/meson.build b/meson.build
@@ -4,45 +4,11 @@
 #
 # license: MIT
 #
-project('CException', 'c',
+project('cexception', 'c',
     license: 'MIT',
     meson_version: '>=0.53.0',
-    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
-
-#
-# Sub directory to project source code
 subdir('lib')
 cexception_dep = declare_dependency(link_with: cexception_lib, include_directories: cexception_dir)