[gnome-bluetooth/wip/hadess/optional-sendto: 2/2] sendto: Make sendto optional




commit 75123c43fa89a524a0a3486f403c55af40aa7b87
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Oct 28 17:40:54 2021 +0200

    sendto: Make sendto optional

 .gitlab-ci.yml    | 2 +-
 meson.build       | 5 ++++-
 meson_options.txt | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1472946..c099c8ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ build_stable:
     - dnf update -y --nogpgcheck
     - dnf install -y --nogpgcheck $DEPENDENCIES
   script:
-    - meson . _build --prefix=/usr -Dicon_update=true -Dgtk_doc=true -Dintrospection=true
+    - meson . _build --prefix=/usr -Dicon_update=true -Dgtk_doc=true -Dintrospection=true -Dsendto=true
     - ninja -C _build
     - ninja -C _build install
     - dnf install -y $TEST_DEPS
diff --git a/meson.build b/meson.build
index 79bf7a24..7a3065f0 100644
--- a/meson.build
+++ b/meson.build
@@ -108,7 +108,9 @@ m_dep = cc.find_library('m')
 
 subdir('icons')
 subdir('lib')
-subdir('sendto')
+if get_option('sendto')
+  subdir('sendto')
+endif
 
 if enable_gtk_doc
   subdir('docs/reference/libgnome-bluetooth')
@@ -136,6 +138,7 @@ output += '        Compiler....................:  ' + cc.get_id() + '\n\n'
 output += '        Compiler Flags..............:  ' + ' '.join(compiler_flags) + '\n'
 output += '        Prefix......................:  ' + gnomebt_prefix + '\n'
 output += '        Documentation...............:  ' + enable_gtk_doc.to_string() + '\n'
+output += '        Send-to.....................:  ' + get_option('sendto').to_string() + '\n'
 output += '        GObject-Introspection.......:  ' + enable_gir.to_string()
 message(output)
 
diff --git a/meson_options.txt b/meson_options.txt
index 1defb70d..eed1137c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
+option('sendto', type: 'boolean', value: true, description: 'Whether to build and install bluetooth-sendto')
 option('icon_update', type: 'boolean', value: true, description: 'Enable icon cache update')
 option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
 option('introspection', type: 'boolean', value: true, description: 'Enable GObject Introspection (depends on 
GObject)')


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