diff options
| author | Felix Riemann <friemann@gnome.org> | 2019-12-08 18:00:53 +0100 |
|---|---|---|
| committer | Felix Riemann <friemann@gnome.org> | 2019-12-08 18:00:53 +0100 |
| commit | e7b19f64b18813391fb149b76c3086c43f3f315d (patch) | |
| tree | b1add1035e1c2db8ada767d00a7ba492b704cf70 | |
| parent | ac13e59886b1a5ebc05ca12dc354f95a1c28c5f5 (diff) | |
| download | libpeas-e7b19f64b18813391fb149b76c3086c43f3f315d.tar.gz | |
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.
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | peas-demo/meson.build | 4 |
2 files changed, 1 insertions, 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 |