[shotwell] build: Consistent meson_options.txt
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell] build: Consistent meson_options.txt
- Date: Tue, 30 Jun 2020 10:39:45 +0000 (UTC)
commit 8e23fa183482cb08a3fd1e31db8fcd5a74bfc590
Author: Jens Georg <mail jensge org>
Date: Tue Jun 30 12:30:27 2020 +0200
build: Consistent meson_options.txt
Use "_" everywhere
flatpak/org.gnome.Shotwell.json | 4 ++--
meson.build | 8 ++++----
meson_options.txt | 12 ++++++------
src/meson.build | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/flatpak/org.gnome.Shotwell.json b/flatpak/org.gnome.Shotwell.json
index 418c27db..6299e2c4 100644
--- a/flatpak/org.gnome.Shotwell.json
+++ b/flatpak/org.gnome.Shotwell.json
@@ -223,8 +223,8 @@
"buildsystem" : "meson",
"config-opts" : [
"-Dudev=false",
- "-Dinstall-apport-hook=false",
- "-Dface-detection=true",
+ "-Dinstall_apport_hook=false",
+ "-Dface_detection=true",
"-Dface_detection_helper_bus=private"
],
"sources" : [
diff --git a/meson.build b/meson.build
index 145fcda9..566cc006 100644
--- a/meson.build
+++ b/meson.build
@@ -73,7 +73,7 @@ webpdemux = dependency('libwebpdemux')
webp = dependency('libwebp')
unity_available = false
-if unity.found() and get_option('unity-support')
+if unity.found() and get_option('unity')
unity_available = true
add_global_arguments(['--define=UNITY_SUPPORT'], language : 'vala')
endif
@@ -93,7 +93,7 @@ foreach measure : get_option('measure')
language : 'vala')
endforeach
-if not get_option('dupe-detection')
+if not get_option('dupe_detection')
add_global_arguments(['--define=NO_DUPE_DETECTION'], language : 'vala')
endif
@@ -101,14 +101,14 @@ if get_option('udev') and gudev.found()
add_global_arguments(['--define=HAVE_UDEV'], language : 'vala')
endif
-if get_option('face-detection')
+if get_option('face_detection')
add_global_arguments(['--define=ENABLE_FACES'], language : 'vala')
if get_option('face_detection_helper_bus') == 'private'
add_global_arguments(['--define=FACEDETECT_BUS_PRIVATE'], language : 'vala')
endif
- if get_option('face-detection-helper')
+ if get_option('face_detection_helper')
subproject('shotwell-facedetect')
endif
endif
diff --git a/meson_options.txt b/meson_options.txt
index 0338d469..39cd8c09 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,12 +1,12 @@
-option('unity-support', type: 'boolean', value : 'false', description: 'Enable Ubuntu Unity support')
+option('unity', type: 'boolean', value : 'false', description: 'Enable Ubuntu Unity support')
option('publishers', type: 'array', choices:
['flickr','googlephotos','piwigo','youtube','gallery3','tumblr'], value :
['flickr','googlephotos','piwigo','youtube','gallery3','tumblr'], description: 'The list of publishing
plugins to build')
-option('extra-plugins', type : 'boolean', value : 'true', description: 'Enable building and installation of
extra publishing plugins')
+option('extra_plugins', type : 'boolean', value : 'true', description: 'Enable building and installation of
extra publishing plugins')
option('trace', type: 'array', choices: ['dtors', 'import', 'md5', 'metadata-writer', 'monitoring',
'pixbuf-cache', 'reflow', 'reflow-items'], value : [], description: 'Enable various trace options')
option('measure', type: 'array', choices: ['enhance', 'import', 'pipeline', 'view-filtering',
'thumbnail-cache'], value : [], description : 'Enable various timing measurements')
-option('dupe-detection', type: 'boolean', value : 'true', description: 'Disable duplicate checks')
+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, 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('install_apport_hook', type : 'boolean', value : 'true', description: 'Enable Ubuntu apport hook')
+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('face_detection_helper_bus', type:'combo', choices: ['private', 'session'], value : 'session',
description: 'Which DBus bus to use for external helper tool')
option('fatal_warnings', type:'boolean', value:false)
diff --git a/src/meson.build b/src/meson.build
index b9729445..896878c7 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -26,7 +26,7 @@ shotwell_libs = [sw_graphics_processor]
face_sources = []
face_obj = ''
-if get_option('face-detection')
+if get_option('face_detection')
face_sources = (['faces/FacesBranch.vala',
'faces/FacePage.vala',
'faces/FaceShape.vala',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]