meson: Fix deprecation warning for pkgconfig
authorScott Anderson <scott.anderson@collabora.com>
Thu, 31 Jan 2019 23:11:31 +0000 (12:11 +1300)
committerScott Anderson <scott.anderson@collabora.com>
Thu, 31 Jan 2019 23:17:01 +0000 (12:17 +1300)
Meson 0.49 now issues a warning for libraries being passed into the
'libraries' keyword argument. Now they should be passed as a positional
argument.

See
https://mesonbuild.com/Release-notes-for-0-49-0.html#deprecation-warning-in-pkgconfig-generator

Signed-off-by: Scott Anderson <scott.anderson@collabora.com>
libweston-desktop/meson.build
libweston/meson.build

index 81bd64e2e74513239610b75ad73b94ef1e895c4a..d6be7a8472f25c9a7e818d45b6b1a6b7008ea4c9 100644 (file)
@@ -25,11 +25,11 @@ dep_lib_desktop = declare_dependency(
 install_headers('libweston-desktop.h', subdir: dir_include_libweston)
 
 pkgconfig.generate(
+       lib_desktop,
        filebase: 'libweston-desktop-@0@'.format(libweston_major),
        name: 'libweston-desktop',
        version: version_weston,
        description: 'Desktop shells abstraction library for libweston compositors',
-       libraries: lib_desktop,
        requires_private: [ lib_weston, dep_wayland_server ],
        subdirs: dir_include_libweston
 )
index bfb5defaa2357a08593d5edca130ddd7670a70d7..1c94433c077a15e822fc237783d01f8bff0c7a63 100644 (file)
@@ -81,11 +81,11 @@ dep_libweston = declare_dependency(
 )
 
 pkgconfig.generate(
+       lib_weston,
        filebase: 'libweston-@0@'.format(libweston_major),
        name: 'libweston API',
        version: version_weston,
        description: 'Header files for libweston compositors development',
-       libraries: lib_weston,
        requires_private: [ dep_wayland_server, dep_pixman, dep_xkbcommon ],
        subdirs: dir_include_libweston
 )