[file-roller/abderrahim/features] build: use meson features for automatic dependencies
- From: Abderrahim Kitouni <akitouni src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller/abderrahim/features] build: use meson features for automatic dependencies
- Date: Wed, 30 Dec 2020 13:59:56 +0000 (UTC)
commit 9d09fed0f5335cef33d8e2acb0a84b44c25ebe01
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Wed Dec 30 14:56:09 2020 +0100
build: use meson features for automatic dependencies
meson.build | 24 ++++++------------------
meson_options.txt | 12 ++++++------
2 files changed, 12 insertions(+), 24 deletions(-)
---
diff --git a/meson.build b/meson.build
index 5f2bb5dc..758e27be 100644
--- a/meson.build
+++ b/meson.build
@@ -31,29 +31,17 @@ gtk_dep = dependency('gtk+-3.0', version : gtk_version)
# Optional dependencies
-if get_option('nautilus-actions')
- libnautilus_extension_dep = dependency('libnautilus-extension', version : nautilus_version, required :
false)
- build_nautilus_actions = libnautilus_extension_dep.found()
-else
- build_nautilus_actions = false
-endif
+libnautilus_extension_dep = dependency('libnautilus-extension', version : nautilus_version, required :
get_option('nautilus-actions'))
+build_nautilus_actions = libnautilus_extension_dep.found()
libjson_glib_dep = dependency('json-glib-1.0', version : json_glib_version, required : false)
use_json_glib = libjson_glib_dep.found()
-if get_option('notification')
- libnotify_dep = dependency('libnotify', version : libnotify_version, required : false)
- use_libnotify = libnotify_dep.found()
-else
- use_libnotify = false
-endif
+libnotify_dep = dependency('libnotify', version : libnotify_version, required : get_option('notification'))
+use_libnotify = libnotify_dep.found()
-if get_option('libarchive')
- libarchive_dep = dependency('libarchive', version : libarchive_version, required : false)
- use_libarchive = libarchive_dep.found()
-else
- use_libarchive = false
-endif
+libarchive_dep = dependency('libarchive', version : libarchive_version, required : get_option('libarchive'))
+use_libarchive = libarchive_dep.found()
have_mkdtemp = c_comp.has_function('mkdtemp')
diff --git a/meson_options.txt b/meson_options.txt
index e2387607..662cc8ef 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -5,14 +5,14 @@ option('run-in-place',
)
option('nautilus-actions',
- type : 'boolean',
- value : true,
+ type : 'feature',
+ value : 'auto',
description : 'Build the nautilus context menu actions'
)
option('notification',
- type : 'boolean',
- value : true,
+ type : 'feature',
+ value : 'auto',
description : 'Enable operation completion notification'
)
@@ -23,8 +23,8 @@ option('packagekit',
)
option('libarchive',
- type : 'boolean',
- value : true,
+ type : 'feature',
+ value : 'auto',
description : 'Enable code that requires libarchive'
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]