[glib: 1/2] Meson: Fix deprecation warning with 0.49.0 release



commit 475f0a9b67b06865966997798a2b0dfef8c7940c
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Fri Dec 7 14:37:51 2018 -0500

    Meson: Fix deprecation warning with 0.49.0 release
    
    http://mesonbuild.com/Release-notes-for-0-49-0.html#deprecation-warning-in-pkgconfig-generator

 gio/meson.build     | 2 +-
 glib/meson.build    | 3 ++-
 gmodule/meson.build | 3 ++-
 gobject/meson.build | 2 +-
 gthread/meson.build | 3 ++-
 5 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/gio/meson.build b/gio/meson.build
index 30bdad06e..272a4a708 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -817,7 +817,7 @@ endif
 
 schemas_subdir = join_paths('glib-2.0', 'schemas')
 
-pkg.generate(libraries : libgio,
+pkg.generate(libgio,
   libraries_private : [osx_ldflags],
   requires : ['glib-2.0', 'gobject-2.0'],
   variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')),
diff --git a/glib/meson.build b/glib/meson.build
index 1a500fa81..3275ee6e1 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -273,7 +273,8 @@ libglib_dep = declare_dependency(
   # We sadly need to export configinc here because everyone includes <glib/*.h>
   include_directories : [configinc, glibinc])
 
-pkg.generate(libraries : [libglib, libintl],
+pkg.generate(libglib,
+  libraries : [libintl],
   libraries_private : [osx_ldflags, win32_ldflags],
   subdirs : ['glib-2.0'],
   extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
diff --git a/gmodule/meson.build b/gmodule/meson.build
index 20c7e3835..8c95136b7 100644
--- a/gmodule/meson.build
+++ b/gmodule/meson.build
@@ -109,7 +109,8 @@ libgmodule = library('gmodule-2.0',
 
 supported_var = 'gmodule_supported=@0@'.format(g_module_impl != '0')
 
-pkg.generate(libraries : [libgmodule, thread_dep],
+pkg.generate(libgmodule,
+  libraries : [thread_dep],
   requires : ['glib-2.0'],
   version : glib_version,
   variables : [supported_var],
diff --git a/gobject/meson.build b/gobject/meson.build
index ad1f1e6ed..a9a8cff86 100644
--- a/gobject/meson.build
+++ b/gobject/meson.build
@@ -74,7 +74,7 @@ libgobject = library('gobject-2.0',
   link_args : glib_link_flags,
 )
 
-pkg.generate(libraries : libgobject,
+pkg.generate(libgobject,
   requires : ['glib-2.0'],
   version : glib_version,
   install_dir : glib_pkgconfigreldir,
diff --git a/gthread/meson.build b/gthread/meson.build
index a626ee84b..d4fca40b8 100644
--- a/gthread/meson.build
+++ b/gthread/meson.build
@@ -23,7 +23,8 @@ libgthread = library('gthread-2.0',
   link_args : glib_link_flags,
 )
 
-pkg.generate(libraries : [libgthread, thread_dep],
+pkg.generate(libgthread,
+  libraries : [thread_dep],
   requires : ['glib-2.0'],
   version : glib_version,
   install_dir : glib_pkgconfigreldir,


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