From 9433514017ae237fb3931c5034945be4f0db8f68 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 7 Oct 2022 13:37:13 -0400 Subject: Override pkg-config dependency within meson --- NEWS | 3 ++- meson.build | 22 +++++++--------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/NEWS b/NEWS index e148431..b419532 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,9 @@ lilv (0.24.21) unstable; urgency=medium * Fix dependencies in pkg-config file + * Override pkg-config dependency within meson - -- David Robillard Wed, 05 Oct 2022 19:46:05 +0000 + -- David Robillard Fri, 07 Oct 2022 17:36:55 +0000 lilv (0.24.20) stable; urgency=medium diff --git a/meson.build b/meson.build index 0bba180..b3ff252 100644 --- a/meson.build +++ b/meson.build @@ -90,21 +90,10 @@ add_project_arguments(platform_defines, language: ['c']) m_dep = cc.find_library('m', required: false) dl_dep = cc.find_library('dl', required: false) -lv2_dep = dependency('lv2', - version: '>= 1.18.2', - fallback: ['lv2', 'lv2_dep']) - -serd_dep = dependency('serd-0', - version: '>= 0.30.10', - fallback: ['serd', 'serd_dep']) - -sord_dep = dependency('sord-0', - version: '>= 0.16.10', - fallback: ['sord', 'sord_dep']) - -sratom_dep = dependency('sratom-0', - version: '>= 0.6.10', - fallback: ['sratom', 'sratom_dep']) +serd_dep = dependency('serd-0', fallback: 'serd', version: '>= 0.30.10') +sord_dep = dependency('sord-0', fallback: 'sord', version: '>= 0.16.10') +lv2_dep = dependency('lv2', fallback: 'lv2', version: '>= 1.18.2') +sratom_dep = dependency('sratom-0', fallback: 'sratom', version: '>= 0.6.10') ########### # Library # @@ -170,6 +159,9 @@ pkg.generate( version: meson.project_version(), ) +# Override pkg-config dependency for internal meson dependants +meson.override_dependency(versioned_name, lilv_dep) + # Install headers to a versioned include directory install_headers(c_headers, subdir: versioned_name / 'lilv') install_headers(cpp_headers, subdir: versioned_name / 'lilv') -- cgit v1.2.1