[gnome-builder] build: be more specific about libportal requirements
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: be more specific about libportal requirements
- Date: Wed, 3 Mar 2021 20:52:51 +0000 (UTC)
commit bc7a914535c19f4e0beef18aad0994bdeea631e4
Author: Christian Hergert <chergert redhat com>
Date: Wed Mar 3 12:51:36 2021 -0800
build: be more specific about libportal requirements
Fixes #1411
src/gstyle/meson.build | 4 ++++
src/plugins/color-picker/meson.build | 6 +++++-
src/plugins/flatpak/meson.build | 5 +++++
src/plugins/update-manager/meson.build | 4 ++++
4 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/src/gstyle/meson.build b/src/gstyle/meson.build
index 2aa92bf31..95e00ed62 100644
--- a/src/gstyle/meson.build
+++ b/src/gstyle/meson.build
@@ -1,3 +1,5 @@
+if libportal_dep.found()
+
libgstyle_headers = [
'gstyle-animation.h',
'gstyle-cielab.h',
@@ -119,3 +121,5 @@ libgstyle_introspection_sources = [
]
subdir('tests')
+
+endif
diff --git a/src/plugins/color-picker/meson.build b/src/plugins/color-picker/meson.build
index cdd68d28b..00aafcf47 100644
--- a/src/plugins/color-picker/meson.build
+++ b/src/plugins/color-picker/meson.build
@@ -1,4 +1,8 @@
-if get_option('plugin_code_index')
+if get_option('plugin_color_picker')
+
+if not libportal_dep.found()
+ error('plugin_color_picker requires libportal')
+endif
install_data('gsettings/org.gnome.builder.plugins.color_picker_plugin.gschema.xml', install_dir: schema_dir)
diff --git a/src/plugins/flatpak/meson.build b/src/plugins/flatpak/meson.build
index 6fab01c1e..1637b04c7 100644
--- a/src/plugins/flatpak/meson.build
+++ b/src/plugins/flatpak/meson.build
@@ -4,6 +4,10 @@ if not get_option('plugin_git')
error('-Dplugin_git=true is required for flatpak')
endif
+if not libportal_dep.found()
+ error('plugin_flatpak requires access to libportal')
+endif
+
plugins_sources += files([
'flatpak-plugin.c',
'gbp-flatpak-application-addin.c',
@@ -38,6 +42,7 @@ plugins_deps += [
dependency('flatpak', version: '>= 0.8.0'),
dependency('ostree-1'),
dependency('libsoup-2.4', version: '>= 2.52.0'),
+ libportal_dep,
]
plugins_sources += plugin_flatpak_resources
diff --git a/src/plugins/update-manager/meson.build b/src/plugins/update-manager/meson.build
index 850971308..f041afb0e 100644
--- a/src/plugins/update-manager/meson.build
+++ b/src/plugins/update-manager/meson.build
@@ -1,6 +1,10 @@
if get_option('plugin_update_manager')
if host_machine.system() == 'linux'
+if not libportal_dep.found()
+ error('plugin_update_manager requires access to libportal')
+endif
+
plugins_deps += [
libportal_dep,
]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]