summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2022-01-21 12:39:30 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2022-01-22 13:25:57 +0530
commitadc07d46188920806e32366917d00599fb183a5a (patch)
treeb34a4cfc53af29db564acbdf6f6307211a81d391
parent3563dfe436da023a5151857ba474b5a19faba3e6 (diff)
downloadpixman-adc07d46188920806e32366917d00599fb183a5a.tar.gz
meson: Fix usage of pkgconfig.generate()
The library that the pkgconfig file is for should be the first positional argument. The `libraries:` kwarg is for libraries that the user must also link against, and which meson does not know about (and hence cannot automatically add to the `Libs:` or `Requires:` section in the .pc file). Fixes: ``` subprojects/pixman/meson.build:564: DEPRECATION: Library pixman-1 was passed to the "libraries" keyword argument of a previous call to generate() method instead of first positional argument. Adding pixman-1 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. ```
-rw-r--r--meson.build3
1 files changed, 1 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index bf270ce..58a1406 100644
--- a/meson.build
+++ b/meson.build
@@ -555,11 +555,10 @@ if not get_option('tests').disabled()
endif
pkg = import('pkgconfig')
-pkg.generate(
+pkg.generate(libpixman,
name : 'Pixman',
filebase : 'pixman-1',
description : 'The pixman library (version 1)',
- libraries : libpixman,
subdirs: 'pixman-1',
version : meson.project_version(),
)