Properly set the dependencies in the pkg-config file

The public API uses gio and gobject header, ensure that these are in the
list of Required pkg-config modules, otherwise they are added to
Required.private which is not OK.
This commit is contained in:
Laurent Bigonville 2020-02-13 18:11:46 +01:00 committed by Benjamin Berg
parent 96fba323b9
commit 3d68cddfe7
2 changed files with 5 additions and 0 deletions

View file

@ -204,6 +204,7 @@ deps = [
enums_dep,
gio_dep,
glib_dep,
gobject_dep,
gusb_dep,
imaging_dep,
mathlib_dep,
@ -269,6 +270,7 @@ libfprint_dep = declare_dependency(link_with: libfprint,
enums_dep,
gio_dep,
glib_dep,
gobject_dep,
gusb_dep,
])
@ -325,6 +327,7 @@ if get_option('introspection')
link_with : libfprint,
dependencies : [
gio_dep,
gobject_dep,
gusb_dep,
],
includes : [

View file

@ -79,6 +79,7 @@ versioned_libname = meson.project_name() + '-' + soversion.to_string()
# Dependencies
glib_dep = dependency('glib-2.0', version: '>=' + glib_min_version)
gio_dep = dependency('gio-unix-2.0', version: '>=' + glib_min_version)
gobject_dep = dependency('gobject-2.0', version: '>=' + glib_min_version)
gusb_dep = dependency('gusb', version: '>= 0.2.0')
mathlib_dep = cc.find_library('m', required: false)
@ -210,6 +211,7 @@ pkgconfig.generate(
description: 'Generic C API for fingerprint reader access',
version: meson.project_version(),
libraries: libfprint,
requires: [gio_dep, gobject_dep],
subdirs: versioned_libname,
filebase: versioned_libname,
)