summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Piñeiro <apinheiro@igalia.com>2020-08-20 10:01:36 +0000
committerAlejandro Piñeiro <apinheiro@igalia.com>2020-08-20 10:01:36 +0000
commit2e21e45aa7b28c19803d001b86e0abdfb9b12c74 (patch)
treee6fd8e80f69dbb697a4ef9bd5db46ad56cc0c490
parentd84ddda9106ca78c815a91aa9e9524533245373f (diff)
parent5541b4fafe612c44de8d8604afe4dab137702f9f (diff)
downloadatk-2e21e45aa7b28c19803d001b86e0abdfb9b12c74.tar.gz
Merge branch 'fix-pkgconfig-gen-with-internal-deps' into 'master'
meson: fix pkg-config generation with internal dependencies See merge request GNOME/atk!39
-rw-r--r--atk/meson.build2
-rw-r--r--meson.build2
2 files changed, 2 insertions, 2 deletions
diff --git a/atk/meson.build b/atk/meson.build
index 5dd736a..d19bbba 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 59d22e2..a1c7846 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()