[libpeas: 1/2] meson: Fix handling of 'demos' parameter
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libpeas: 1/2] meson: Fix handling of 'demos' parameter
- Date: Sat, 18 Jan 2020 16:31:32 +0000 (UTC)
commit e7b19f64b18813391fb149b76c3086c43f3f315d
Author: Felix Riemann <friemann gnome org>
Date: Sun Dec 8 18:00:53 2019 +0100
meson: Fix handling of 'demos' parameter
Internally the build script evaluated the 'widgetry' parameter instead
which is just a dependency of 'demos'. Evaluate the correct parameter
to show the correct state in the build summary. Also drop the now obsolete
duplicate check in peas-demo's meson script.
meson.build | 2 +-
peas-demo/meson.build | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 5abb4bb..44938cd 100644
--- a/meson.build
+++ b/meson.build
@@ -206,7 +206,7 @@ if build_gtk_widgetry and not gtk_dep.found()
build_gtk_widgetry = false
endif
-build_demos = get_option('widgetry')
+build_demos = get_option('demos')
if build_demos and not build_gtk_widgetry
build_demos = false
endif
diff --git a/peas-demo/meson.build b/peas-demo/meson.build
index b0cc133..e987210 100644
--- a/peas-demo/meson.build
+++ b/peas-demo/meson.build
@@ -1,5 +1,3 @@
-if get_option('demos')
-
peas_demo_name = 'peas-demo'
peas_demo_string = '@0@-@1@'.format(peas_demo_name, api_version)
peas_demo_plugins_dir = join_paths(get_option('libdir'), 'peas-demo', 'plugins')
@@ -25,5 +23,3 @@ executable(
)
subdir('plugins')
-
-endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]