examples can be compiled even if !enable_goabackend

This also means searching for librest even if !enable_goabackend. However, in that case the build can proceed without the library and only the example that uses it is removed.

examples can be compiled even if !enable_goabackend
67c4eed6 · Paolo Bonzini · Emmanuele Bassi · f81441b7 · 67c4eed6 · 67c4eed6
Commit 67c4eed6 authored 3 years ago by Paolo Bonzini Committed by Emmanuele Bassi 3 years ago
--- a/meson.build
+++ b/meson.build
@@ -102,13 +102,14 @@ if enable_goabackend
  libsecret_dep = dependency('libsecret-1')
  libsoup_dep = dependency('libsoup-3.0', version: '>= 3.0', fallback: ['libsoup'])
  libxml_dep = dependency('libxml-2.0')
-  rest_dep = dependency('rest-1.0',
-    version: '>= 0.9.0',
-    fallback: ['librest', 'librest_dep'],
-    default_options: ['soup2=false', 'examples=false', 'tests=false', 'gtk_doc=false'],
-  )
  webkit_gtk_dep = dependency('webkit2gtk-4.1', version: '>= 2.33.1')
 endif
+rest_dep = dependency('rest-1.0',
+  version: '>= 0.9.0',
+  fallback: ['librest', 'librest_dep'],
+  required: enable_goabackend,
+  default_options: ['soup2=false', 'examples=false', 'tests=false', 'gtk_doc=false'],
+)
 config_h.set('GOA_BACKEND_ENABLED', enable_goabackend)

 enable_inspector = get_option('inspector')

--- a/src/examples/meson.build
+++ b/src/examples/meson.build
 programs = [
  # program name, deps
  ['list-accounts', libgoa_dep],
-  ['lastfm-shout', [libgoa_dep, rest_dep]]
 ]
-
+if rest_dep.found()
+  ['lastfm-shout', [libgoa_dep, rest_dep]]
+endif
 if enable_goabackend
  programs += [
    ['introspect-providers', libgoa_backend_dep],

--- a/src/meson.build
+++ b/src/meson.build
@@ -11,5 +11,6 @@ if enable_goabackend

  subdir('goabackend')
  subdir('daemon')
-  subdir('examples')
 endif
+
+subdir('examples')