diff options
| author | Antonio Ospite <ao2@ao2.it> | 2020-03-15 23:18:24 +0100 |
|---|---|---|
| committer | Antonio Ospite <ao2@ao2.it> | 2020-08-19 23:53:58 +0200 |
| commit | 5541b4fafe612c44de8d8604afe4dab137702f9f (patch) | |
| tree | e6fd8e80f69dbb697a4ef9bd5db46ad56cc0c490 | |
| parent | d84ddda9106ca78c815a91aa9e9524533245373f (diff) | |
| download | atk-5541b4fafe612c44de8d8604afe4dab137702f9f.tar.gz | |
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
| -rw-r--r-- | atk/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 2 |
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() |