diff options
| author | Sam Thursfield <sam@afuera.me.uk> | 2021-05-20 14:39:01 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam@afuera.me.uk> | 2021-05-20 14:39:01 +0000 |
| commit | 58b5461ac1673005b3ec63b862443b30517be2a5 (patch) | |
| tree | 72b592488883b11a64b6faab3bfffd6e57b012cc | |
| parent | b831203c80955837596c708a2cbfa37dba31d05f (diff) | |
| parent | 7f33cf1913e90e3b8cc9c2546cb860f4c1d66d99 (diff) | |
| download | libmediaart-58b5461ac1673005b3ec63b862443b30517be2a5.tar.gz | |
Merge branch 'ebassi/build' into 'master'
build: Export the pkg-config file in the GIR
See merge request GNOME/libmediaart!9
| -rw-r--r-- | libmediaart/meson.build | 11 | ||||
| -rw-r--r-- | meson.build | 13 |
2 files changed, 13 insertions, 11 deletions
diff --git a/libmediaart/meson.build b/libmediaart/meson.build index 20f0942..c43fb9e 100644 --- a/libmediaart/meson.build +++ b/libmediaart/meson.build @@ -41,6 +41,11 @@ libmediaart = shared_library( install: true, ) +gir_args = [ + '--quiet', + '-DLIBMEDIAART_COMPILATION', +] + libmediaart_gir_and_typelib = gnome.generate_gir(libmediaart, sources: libmediaart_sources + libmediaart_introspection_sources + libmediaart_public_headers, nsversion: libmediaart_api_version, @@ -48,9 +53,9 @@ libmediaart_gir_and_typelib = gnome.generate_gir(libmediaart, identifier_prefix: 'MediaArt', symbol_prefix: 'media_art', includes: ['Gio-2.0', 'GObject-2.0'], - extra_args: libmediaart_cflags + [ - '--c-include=libmediaart/mediaart.h', - ], + header: 'libmediaart/mediaart.h', + export_packages: 'libmediaart-' + libmediaart_api_version, + extra_args: gir_args, install: true ) diff --git a/meson.build b/meson.build index f4196f4..704cba0 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,6 @@ project('libmediaart', 'c', version: '1.9.4', + meson_version: '>= 0.56.2', default_options: [ 'warning_level=1' ]) gnome = import('gnome') @@ -122,12 +123,8 @@ pkgconfig.generate( requires_private: image_library_name, libraries_private: ['-lz', '-lm']) -summary = [ - '\nBuild Configuration:', - ' Prefix: ' + get_option('prefix'), - ' Source code location: ' + meson.source_root(), - ' Compiler: ' + cc.get_id(), - ' Image processing library: ' + image_library_name, -] +summary('prefix', get_option('prefix'), section: 'Directories') +summary('includedir', get_option('includedir'), section: 'Directories') +summary('libdir', get_option('libdir'), section: 'Directories') -message('\n'.join(summary)) +summary('Image processing library', image_library_name, section: 'Build') |