diff options
| -rw-r--r-- | gck/meson.build | 22 | ||||
| -rw-r--r-- | gcr-gtk3/meson.build | 40 | ||||
| -rw-r--r-- | gcr-gtk4/meson.build | 42 | ||||
| -rw-r--r-- | gcr/meson.build | 26 | ||||
| -rw-r--r-- | meson.build | 6 | ||||
| -rw-r--r-- | meson_options.txt | 5 |
6 files changed, 80 insertions, 61 deletions
diff --git a/gck/meson.build b/gck/meson.build index fa108ef..ca30f7f 100644 --- a/gck/meson.build +++ b/gck/meson.build @@ -141,16 +141,18 @@ if get_option('introspection') install: true, ) - gck_vapi = gnome.generate_vapi(gck_basename, - sources: gck_gir[0], - metadata_dirs: meson.current_source_dir(), - packages: [ 'glib-2.0', 'gio-2.0' ], - install: true, - ) - - install_data('pkcs11.vapi', - install_dir: get_option('datadir') / 'vala' / 'vapi', - ) + if enable_vapi + gck_vapi = gnome.generate_vapi(gck_basename, + sources: gck_gir[0], + metadata_dirs: meson.current_source_dir(), + packages: [ 'glib-2.0', 'gio-2.0' ], + install: true, + ) + + install_data('pkcs11.vapi', + install_dir: get_option('datadir') / 'vala' / 'vapi', + ) + endif endif # pkg-config file diff --git a/gcr-gtk3/meson.build b/gcr-gtk3/meson.build index 5737586..3ad4f74 100644 --- a/gcr-gtk3/meson.build +++ b/gcr-gtk3/meson.build @@ -111,25 +111,27 @@ if get_option('introspection') install: true, ) - gcr_gtk3_vapi = gnome.generate_vapi(gcr_gtk3_basename, - sources: gcr_gtk3_gir[0], - packages: [ - 'glib-2.0', - 'gio-2.0', - gck_vapi, - gcr_vapi, - 'gtk+-3.0' - ], - vapi_dirs: [ - build_root / 'gck', - build_root / 'gcr', - ], - gir_dirs: [ - build_root / 'gck', - build_root / 'gcr', - ], - install: true, - ) + if enable_vapi + gcr_gtk3_vapi = gnome.generate_vapi(gcr_gtk3_basename, + sources: gcr_gtk3_gir[0], + packages: [ + 'glib-2.0', + 'gio-2.0', + gck_vapi, + gcr_vapi, + 'gtk+-3.0' + ], + vapi_dirs: [ + build_root / 'gck', + build_root / 'gcr', + ], + gir_dirs: [ + build_root / 'gck', + build_root / 'gcr', + ], + install: true, + ) + endif endif # Register new mime types diff --git a/gcr-gtk4/meson.build b/gcr-gtk4/meson.build index aa3f669..a351f2f 100644 --- a/gcr-gtk4/meson.build +++ b/gcr-gtk4/meson.build @@ -106,24 +106,26 @@ if get_option('introspection') install: true, ) - gcr_gtk4_vapi = gnome.generate_vapi(gcr_gtk4_basename, - sources: gcr_gtk4_gir[0], - packages: [ - 'glib-2.0', - 'gio-2.0', - gck_vapi, - gcr_vapi, - 'gtk4' - ], - metadata_dirs: meson.current_source_dir(), - vapi_dirs: [ - build_root / 'gck', - build_root / 'gcr', - ], - gir_dirs: [ - build_root / 'gck', - build_root / 'gcr', - ], - install: true, - ) + if enable_vapi + gcr_gtk4_vapi = gnome.generate_vapi(gcr_gtk4_basename, + sources: gcr_gtk4_gir[0], + packages: [ + 'glib-2.0', + 'gio-2.0', + gck_vapi, + gcr_vapi, + 'gtk4' + ], + metadata_dirs: meson.current_source_dir(), + vapi_dirs: [ + build_root / 'gck', + build_root / 'gcr', + ], + gir_dirs: [ + build_root / 'gck', + build_root / 'gcr', + ], + install: true, + ) + endif endif diff --git a/gcr/meson.build b/gcr/meson.build index 59ec0fa..745dade 100644 --- a/gcr/meson.build +++ b/gcr/meson.build @@ -189,18 +189,20 @@ if get_option('introspection') install: true, ) - gcr_vapi = gnome.generate_vapi(gcr_basename, - sources: gcr_gir[0], - packages: [ 'glib-2.0', 'gio-2.0', gck_vapi ], - metadata_dirs: meson.current_source_dir(), - vapi_dirs: [ - build_root / 'gck', - ], - gir_dirs: [ - build_root / 'gck', - ], - install: true, - ) + if enable_vapi + gcr_vapi = gnome.generate_vapi(gcr_basename, + sources: gcr_gir[0], + packages: [ 'glib-2.0', 'gio-2.0', gck_vapi ], + metadata_dirs: meson.current_source_dir(), + vapi_dirs: [ + build_root / 'gck', + ], + gir_dirs: [ + build_root / 'gck', + ], + install: true, + ) + endif endif # pkg-config file diff --git a/meson.build b/meson.build index dd70d01..1070660 100644 --- a/meson.build +++ b/meson.build @@ -82,6 +82,12 @@ if get_option('gtk4') gtk4_dep = dependency('gtk4') endif +enable_gir = get_option('introspection') +enable_vapi = get_option('vapi') +if enable_vapi + assert(enable_gir, 'vapi support was requested, but introspection support is mandatory.') +endif + # configuration conf = configuration_data() conf.set_quoted('VERSION', meson.project_version()) diff --git a/meson_options.txt b/meson_options.txt index 6f4bc52..66d1567 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,6 +3,11 @@ option('introspection', value: true, description: 'Build GObject Introspection (GIR) files', ) +option('vapi', + type: 'boolean', + value: true, + description: 'Generate vapi data (requires vapigen and introspection option)', +) option('gtk3', type: 'boolean', value: true, |