[libgweather/pc-file-deps] build: Use a variable for the pkg-config name




commit 25a02d45e38df7238b0a3e6d1645fa5026d8ae06
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Sun Oct 17 14:14:52 2021 +0100

    build: Use a variable for the pkg-config name
    
    It seems that some of the targets using the pkg-config file name do not
    like it when we directly pass a formatted string object.

 libgweather/meson.build | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/libgweather/meson.build b/libgweather/meson.build
index d0a0aff7..8b6d9584 100644
--- a/libgweather/meson.build
+++ b/libgweather/meson.build
@@ -39,6 +39,8 @@ libgweather_darwin_versions = [
   '@0@.@1@'.format(current + 1, interface_age),
 ]
 
+gweather_pc = 'gweather@0@'.format(libgweather_api)
+
 config_h = configuration_data()
 config_h.set_quoted('GETTEXT_PACKAGE', GETTEXT_PACKAGE)
 config_h.set_quoted('LOCATIONS_GETTEXT_PACKAGE', LOCATIONS_GETTEXT_PACKAGE)
@@ -194,7 +196,7 @@ if build_gir
     includes: ['Gio-2.0'],
     symbol_prefix: 'gweather',
     identifier_prefix: 'GWeather',
-    export_packages: 'gweather'.format(libgweather_api),
+    export_packages: gweather_pc,
     header: 'libgweather/gweather.h',
     extra_args: [
       '--warn-all',
@@ -218,7 +220,7 @@ libgweather_dep = declare_dependency(
 )
 
 if build_vapi and build_gir
-  gnome.generate_vapi('gweather@0@'.format(libgweather_api),
+  gnome.generate_vapi(gweather_pc,
     sources: gweather_gir[0],
     packages: ['gio-2.0'],
     metadata_dirs: '.',
@@ -227,7 +229,7 @@ if build_vapi and build_gir
 endif
 
 pkgconfig.generate(
-  filebase: 'gweather@0@'.format(libgweather_api),
+  filebase: gweather_pc,
   name: 'GWeather',
   description: 'Gather weather information from online services',
   version: meson.project_version(),


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