[bijiben/wip/inigomartinez/meson: 4/6] build: Removed flags available as meson options



commit d8f57af5159a602e6f9f4e656c3f44cec6c85597
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Fri Jun 23 10:46:42 2017 +0200

    build: Removed flags available as meson options
    
    Removed CFLAGS and LDFLAGS that can be enabled by using meson
    options.

 meson.build |   89 +++++++++++++++++++++++++++-------------------------------
 1 files changed, 41 insertions(+), 48 deletions(-)
---
diff --git a/meson.build b/meson.build
index 73ed338..ad1805e 100644
--- a/meson.build
+++ b/meson.build
@@ -55,60 +55,53 @@ config_h.set('HAVE_UNISTD_H', cc.has_header('unistd.h'))
 # functions
 config_h.set('HAVE_GETTEXT', cc.has_function('gettext'))
 
-# Compiler flags
-test_cflags = [
-  '-fno-strict-aliasing',
-  '-Wall',
-  '-Warray-bounds',
-  '-Wcast-align',
-  '-Wdeclaration-after-statement',
-  '-Wextra',
-  '-Wformat-nonliteral',
-  '-Wformat-security',
-  '-Wformat=2',
-  '-Wimplicit-function-declaration',
-  '-Winit-self',
-  '-Winline',
-  '-Wmissing-declarations',
-  '-Wmissing-format-attribute',
-  '-Wmissing-include-dirs',
-  '-Wmissing-noreturn',
-  '-Wmissing-prototypes',
-  '-Wnested-externs',
-  '-Wno-error=missing-field-initializers',
-  '-Wno-error=unused-parameter',
-  '-Wno-missing-field-initializers',
-  '-Wno-suggest-attribute=format',
-  '-Wno-unused-parameter',
-  '-Wold-style-definition',
-  '-Wpacked',
-  '-Wpointer-arith',
-  '-Wredundant-decls',
-  '-Wreturn-type',
-  '-Wshadow',
-  '-Wsign-compare',
-  '-Wstrict-aliasing',
-  '-Wstrict-prototypes',
-  '-Wswitch-default',
-  '-Wswitch-enum',
-  '-Wundef',
-  '-Wunused-but-set-variable',
-  '-Wwrite-strings'
-]
-
+# compiler flags
 bijiben_flags = [
   '-DHAVE_CONFIG_H',
   '-DDATADIR="@0@"'.format(bijiben_datadir),
   '-DPACKAGE_LOCALE_DIR="@0@"'.format(bijiben_localedir)
 ]
 
-foreach cflag: test_cflags
-  if cc.has_argument(cflag)
-    bijiben_flags += [cflag]
-  endif
-endforeach
+buildtype = get_option('buildtype')
+if buildtype == 'debug' or buildtype == 'debugoptimized'
+  test_cflags = [
+    '-fno-strict-aliasing',
+    '-Wcast-align',
+    '-Wdeclaration-after-statement',
+    '-Wformat-nonliteral',
+    '-Wformat=2',
+    '-Winit-self',
+    '-Winline',
+    '-Wmissing-declarations',
+    '-Wmissing-format-attribute',
+    '-Wmissing-include-dirs',
+    '-Wmissing-noreturn',
+    '-Wmissing-prototypes',
+    '-Wnested-externs',
+    '-Wno-error=missing-field-initializers',
+    '-Wno-error=unused-parameter',
+    '-Wno-missing-field-initializers',
+    '-Wno-suggest-attribute=format',
+    '-Wno-unused-parameter',
+    '-Wold-style-definition',
+    '-Wpacked',
+    '-Wredundant-decls',
+    '-Wshadow',
+    '-Wstrict-prototypes',
+    '-Wswitch-enum',
+    '-Wundef',
+    '-Wunused-but-set-variable',
+    '-Wwrite-strings'
+  ]
 
-add_project_arguments(bijiben_flags, language: 'c')
+  foreach cflag: test_cflags
+    if cc.has_argument(cflag)
+      bijiben_flags += [cflag]
+    endif
+  endforeach
+
+  add_project_arguments(bijiben_flags, language: 'c')
+endif
 
 tracker_sparql_dep = dependency('tracker-sparql-1.0', required: false)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]