From 5ca63769bc0ea3ffd4e8e33c15b32f72ba558e14 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 7 Oct 2022 13:26:09 -0400 Subject: Override pkg-config dependency within meson --- NEWS | 3 ++- meson.build | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 16f9e6a..b0f1cda 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,10 @@ sord (0.16.15) unstable; urgency=medium * Fix dependencies in pkg-config file + * Override pkg-config dependency within meson * Port sord_validate to pcre2 - -- David Robillard Fri, 07 Oct 2022 15:03:36 +0000 + -- David Robillard Fri, 07 Oct 2022 17:24:52 +0000 sord (0.16.14) stable; urgency=medium diff --git a/meson.build b/meson.build index 2bfd814..257d3de 100644 --- a/meson.build +++ b/meson.build @@ -41,9 +41,7 @@ endif m_dep = cc.find_library('m', required: false) -serd_dep = dependency('serd-0', - version: '>= 0.30.10', - fallback: ['serd', 'serd_dep']) +serd_dep = dependency('serd-0', version: '>= 0.30.10') ########### # Library # @@ -99,6 +97,9 @@ pkg.generate( version: meson.project_version(), ) +# Override pkg-config dependency for internal meson dependants +meson.override_dependency(versioned_name, sord_dep) + # Install headers to a versioned include directory install_headers(c_headers, subdir: versioned_name / 'sord') install_headers(cpp_headers, subdir: versioned_name / 'sord') -- cgit v1.2.1