From 94e66b9793932483b5b0f5f67a16c4c16bd4665c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 7 Oct 2022 13:25:56 -0400 Subject: Override pkg-config dependency within meson --- NEWS | 6 ++++++ doc/serdi.1 | 2 +- meson.build | 5 ++++- src/serd_config.h | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 520be177..cbcb4286 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +serd (0.30.17) unstable; urgency=medium + + * Override pkg-config dependency within meson + + -- David Robillard Fri, 07 Oct 2022 17:20:42 +0000 + serd (0.30.16) stable; urgency=medium * Add SERD_STATIC to pkg-config Cflags for static-only builds diff --git a/doc/serdi.1 b/doc/serdi.1 index c9a9df9a..88546884 100644 --- a/doc/serdi.1 +++ b/doc/serdi.1 @@ -2,7 +2,7 @@ .\" # SPDX-License-Identifier: ISC .Dd Jul 15, 2022 .Dt SERDI 1 -.Os Serd 0.30.16 +.Os Serd 0.30.17 .Sh NAME .Nm serdi .Nd read and write RDF syntax diff --git a/meson.build b/meson.build index 2fe58108..8f3c2876 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ # SPDX-License-Identifier: 0BSD OR ISC project('serd', ['c'], - version: '0.30.16', + version: '0.30.17', license: 'ISC', meson_version: '>= 0.56.0', default_options: [ @@ -110,6 +110,9 @@ pkg.generate( version: meson.project_version(), ) +# Override pkg-config dependency for internal meson dependants +meson.override_dependency(versioned_name, serd_dep) + # Install header to a versioned include directory install_headers(c_headers, subdir: versioned_name / 'serd') diff --git a/src/serd_config.h b/src/serd_config.h index f9d6269a..98fb01c9 100644 --- a/src/serd_config.h +++ b/src/serd_config.h @@ -16,7 +16,7 @@ #define SERD_CONFIG_H // Define version unconditionally so a warning will catch a mismatch -#define SERD_VERSION "0.30.16" +#define SERD_VERSION "0.30.17" #if !defined(SERD_NO_DEFAULT_CONFIG) -- cgit v1.2.1