[shotwell/wip/phako/enhanced-faces: 2/5] meson: Add option for the face detection helper



commit 1b3e9c687b962621b31705828ea3581f75da3a46
Author: Jens Georg <mail jensge org>
Date:   Thu Oct 11 11:42:37 2018 +0200

    meson: Add option for the face detection helper
    
    So that we can provide it through a flatpak

 meson.build       | 4 +++-
 meson_options.txt | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index b7296d4a..2e57fecb 100644
--- a/meson.build
+++ b/meson.build
@@ -88,7 +88,9 @@ endif
 
 if get_option('face-detection')
   add_global_arguments(['--define=ENABLE_FACES'], language : 'vala')
-  subproject('shotwell-facedetect')
+  if get_option('face-detection-helper')
+      subproject('shotwell-facedetect')
+  endif
 endif
 
 json_glib = dependency('json-glib-1.0')
diff --git a/meson_options.txt b/meson_options.txt
index 30e3f3bf..0faf450b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,3 +7,4 @@ option('dupe-detection', type: 'boolean', value : 'true', description: 'Disable
 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-helper', type : 'boolean', value : 'true', description : 'If face-detection is 
enabled, build the external helper tool')


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