[atk: 1/2] meson: fix pkg-config generation with internal dependencies
- From: Alejandro Piñeiro <apinheiro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [atk: 1/2] meson: fix pkg-config generation with internal dependencies
- Date: Thu, 20 Aug 2020 10:01:37 +0000 (UTC)
commit 5541b4fafe612c44de8d8604afe4dab137702f9f
Author: Antonio Ospite <ao2 ao2 it>
Date: Sun Mar 15 23:18:24 2020 +0100
meson: fix pkg-config generation with internal dependencies
When building with internal dependencies (subprojects) meson fails to
configure the build with the following message:
subprojects/atk/atk/meson.build:161:10: ERROR: requires argument not a string, library with
pkgconfig-generated file or pkgconfig-dependency object, got <InternalDependency null: True>
Use libraries instead of requires when calling pkgconfig.generate() to
make the configuration succeed.
Change inspired by
https://gitlab.freedesktop.org/libnice/libnice/commit/ff75be1b19fc2599fda520321649da32625c561d
atk/meson.build | 2 +-
meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/atk/meson.build b/atk/meson.build
index 5dd736ab..d19bbbac 100644
--- a/atk/meson.build
+++ b/atk/meson.build
@@ -164,5 +164,5 @@ pkgconfig.generate(libatk,
description: 'Accessibility Toolkit',
subdirs: atk_api_name,
filebase: 'atk',
- requires: glib_dep,
+ libraries: glib_dep,
)
diff --git a/meson.build b/meson.build
index 59d22e25..a1c7846d 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@ project('atk', 'c',
'warning_level=1',
'c_std=c99',
],
- meson_version : '>= 0.46.0')
+ meson_version : '>= 0.49.0')
cc = meson.get_compiler('c')
host_system = host_machine.system()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]