StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson.build: fix pkgconfig deprecation warning 

../meson.build:239: DEPRECATION: Library xkbcommon was passed to the "libraries"
keyword argument of a previous call to generate() method instead of first
positional argument. Adding xkbcommon to "Requires" field, but this is a
deprecated behaviour that will change in a future version of Meson. Please
report the issue if this warning cannot be avoided in your case.

This was introduced in meson 0.49.0

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
master
Peter Hutterer 2020-07-23 09:22:51 +10:00 committed by Ran Benita
parent a4901662c3
commit 2a83430572
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@ -7,7 +7,7 @@ project(
'warning_level=2', 'warning_level=2',
'b_lundef=true', 'b_lundef=true',
], ],
meson_version : '>= 0.41.0', meson_version : '>= 0.49.0',
) )
pkgconfig = import('pkgconfig') pkgconfig = import('pkgconfig')
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
@ -237,9 +237,9 @@ install_headers(
subdir: 'xkbcommon', subdir: 'xkbcommon',
) )
pkgconfig.generate( pkgconfig.generate(
libxkbcommon,
name: 'xkbcommon', name: 'xkbcommon',
filebase: 'xkbcommon', filebase: 'xkbcommon',
libraries: libxkbcommon,
version: meson.project_version(), version: meson.project_version(),
description: 'XKB API common to servers and clients', description: 'XKB API common to servers and clients',
) )
@ -290,9 +290,9 @@ You can disable X11 support with -Denable-x11=false.''')
subdir: 'xkbcommon', subdir: 'xkbcommon',
) )
pkgconfig.generate( pkgconfig.generate(
libxkbcommon_x11,
name: 'xkbcommon-x11', name: 'xkbcommon-x11',
filebase: 'xkbcommon-x11', filebase: 'xkbcommon-x11',
libraries: libxkbcommon_x11,
version: meson.project_version(), version: meson.project_version(),
description: 'XKB API common to servers and clients - X11 support', description: 'XKB API common to servers and clients - X11 support',
requires: ['xkbcommon'], requires: ['xkbcommon'],
@ -331,9 +331,9 @@ if get_option('enable-xkbregistry')
subdir: 'xkbcommon', subdir: 'xkbcommon',
) )
pkgconfig.generate( pkgconfig.generate(
libxkbregistry,
name: 'xkbregistry', name: 'xkbregistry',
filebase: 'xkbregistry', filebase: 'xkbregistry',
libraries: libxkbregistry,
version: meson.project_version(), version: meson.project_version(),
description: 'XKB API to query available rules, models, layouts, variants and options', description: 'XKB API to query available rules, models, layouts, variants and options',
) )