From 3d68cddfe7abc796b7eab1490cbc7ee2ccde81cb Mon Sep 17 00:00:00 2001 From: Laurent Bigonville Date: Thu, 13 Feb 2020 18:11:46 +0100 Subject: [PATCH] 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. --- libfprint/meson.build | 3 +++ meson.build | 2 ++ 2 files changed, 5 insertions(+) diff --git a/libfprint/meson.build b/libfprint/meson.build index a7aa3d6..4715307 100644 --- a/libfprint/meson.build +++ b/libfprint/meson.build @@ -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 : [ diff --git a/meson.build b/meson.build index d4248d8..7bb52b4 100644 --- a/meson.build +++ b/meson.build @@ -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, )