Skip to content

Commit

Permalink
Meson: Fix deprecation warning with 0.49.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
xclaesse committed Dec 10, 2018
1 parent fa80a2d commit 475f0a9
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion gio/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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')),
Expand Down
3 changes: 2 additions & 1 deletion glib/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion gmodule/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
2 changes: 1 addition & 1 deletion gobject/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion gthread/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 475f0a9

Please sign in to comment.