From bfd0789a21659d5cbd0f16dd9671938c90ce93ce Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 7 Oct 2022 13:35:14 -0400 Subject: Override pkg-config dependency within meson --- NEWS | 3 ++- meson.build | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 70dba5d..2677ef7 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,9 @@ suil (0.10.19) unstable; urgency=medium * Fix dependencies in pkg-config file + * Override pkg-config dependency within meson - -- David Robillard Wed, 05 Oct 2022 19:47:11 +0000 + -- David Robillard Fri, 07 Oct 2022 17:34:53 +0000 suil (0.10.18) stable; urgency=medium diff --git a/meson.build b/meson.build index 05c798d..433cbb4 100644 --- a/meson.build +++ b/meson.build @@ -55,14 +55,11 @@ nodelete_cpp_link_args = cpp.get_supported_link_arguments(['-Wl,-z,nodelete']) dl_dep = cc.find_library('dl', required: false) -lv2_dep = dependency( - 'lv2', - version: '>= 1.18.3', - fallback: ['lv2', 'lv2_dep'], -) +lv2_dep = dependency('lv2', fallback: 'lv2', version: '>= 1.18.3') x11_dep = dependency( 'x11', + include_type: 'system', required: get_option('x11'), ) @@ -172,6 +169,9 @@ pkg.generate( version: meson.project_version(), ) +# Override pkg-config dependency for internal meson dependants +meson.override_dependency(versioned_name, suil_dep) + # Install header to a versioned include directory install_headers(c_headers, subdir: versioned_name / 'suil') -- cgit v1.2.1