[shotwell] Make fatal-warnings an option



commit 3f0f5180c050d0e25504c2cc97600d36562bbec4
Author: Jens Georg <mail jensge org>
Date:   Sat Mar 16 19:31:13 2019 +0100

    Make fatal-warnings an option

 meson.build       | 10 +++++++++-
 meson_options.txt |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 0d4e86ee..a940c9ac 100644
--- a/meson.build
+++ b/meson.build
@@ -27,12 +27,20 @@ add_global_arguments(
         '--target-glib=2.40',
         '--vapidir=@0@'.format(join_paths(meson.current_source_dir(), 'vapi')),
         '--enable-checking',
-        '--fatal-warnings',
         '--enable-experimental',
     ],
     language : 'vala'
 )
 
+if get_option('fatal_warnings')
+    add_global_arguments(
+        [
+            '--fatal-warnings'
+        ],
+        language : 'vala'
+    )
+endif
+
 version_h = vcs_tag(command: ['git', 'rev-parse', 'HEAD'], input: 'version.h.in', output: 'version.h', 
fallback: '')
 version = declare_dependency(sources : version_h, include_directories : include_directories('.'))
 
diff --git a/meson_options.txt b/meson_options.txt
index f9b17a75..72fbe5d2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,5 +6,6 @@ option('measure', type: 'string', value : '', description : 'Enable various timi
 option('dupe-detection', type: 'boolean', value : 'true', description: 'Disable duplicate checks')
 option('udev', type: 'boolean', value : 'true', description: 'Enable or disable udev support')
 option('install-apport-hook', type : 'boolean', value : 'true', description: 'Enable Ubuntu apport hook')
-option('face-detection', type:'boolean', value:false)
+option('face-detection', type:'boolean', value:false, description: 'Enable face detection and recognition 
features')
 option('face-detection-helper', type : 'boolean', value : 'true', description : 'If face-detection is 
enabled, build the external helper tool')
+option('fatal_warnings', type:'boolean', value:false)


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