[gcr/main: 29/30] meson: Use the library object directly to generate the pkg-config file




commit 5d63543de07f3ad57855ea7ed0721928ffd3fe9a
Author: Corentin Noël <tintou noel tf>
Date:   Thu Mar 24 22:22:29 2022 +0100

    meson: Use the library object directly to generate the pkg-config file
    
    Allows to actually use the correct flags

 gcr-gtk3/meson.build | 4 ++--
 gcr-gtk4/meson.build | 5 +++--
 gcr/meson.build      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/gcr-gtk3/meson.build b/gcr-gtk3/meson.build
index e655ec94..cc41fd4e 100644
--- a/gcr-gtk3/meson.build
+++ b/gcr-gtk3/meson.build
@@ -70,8 +70,8 @@ gcr_gtk3_pkgconf_deps = [
   glib_dep,
   gio_dep,
   gobject_dep,
-  'gck-@0@'.format(gck_major_version),
-  'gcr-@0@'.format(gcr_major_version),
+  gck_lib,
+  gcr_lib,
   gtk3_dep,
 ]
 pkgconfig.generate(gcr_gtk3_lib,
diff --git a/gcr-gtk4/meson.build b/gcr-gtk4/meson.build
index 30c5b927..2fd63cf7 100644
--- a/gcr-gtk4/meson.build
+++ b/gcr-gtk4/meson.build
@@ -64,10 +64,11 @@ gcr_gtk4_pkgconf_deps = [
   glib_dep,
   gio_dep,
   gobject_dep,
-  'gck-@0@'.format(gck_major_version),
-  'gcr-@0@'.format(gcr_major_version),
+  gck_lib,
+  gcr_lib,
   gtk4_dep,
 ]
+
 pkgconfig.generate(gcr_gtk4_lib,
   subdirs: 'gcr-@0@'.format(gcr_major_version),
   requires: gcr_gtk4_pkgconf_deps,
diff --git a/gcr/meson.build b/gcr/meson.build
index e452221c..5eb5b480 100644
--- a/gcr/meson.build
+++ b/gcr/meson.build
@@ -205,7 +205,7 @@ endif
 # pkg-config file
 pkgconfig.generate(gcr_lib,
   subdirs: 'gcr-@0@'.format(gcr_major_version),
-  requires: [ glib_dep, gio_dep, gobject_dep, p11kit_dep, 'gck-@0@'.format(gck_major_version) ],
+  requires: [ glib_dep, gio_dep, gobject_dep, p11kit_dep, gck_lib ],
   description: 'GObject and GUI library for high level crypto parsing and display',
 )
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]