summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2022-10-07 13:37:13 -0400
committerDavid Robillard <d@drobilla.net>2022-10-07 13:37:13 -0400
commit9433514017ae237fb3931c5034945be4f0db8f68 (patch)
tree427ca134b4609b4c20afc3eebdc4c85b33619ae6
parent3386725522269a1bbdd342cb9e3fa6fb00e0f37f (diff)
downloadlilv-9433514017ae237fb3931c5034945be4f0db8f68.tar.gz
lilv-9433514017ae237fb3931c5034945be4f0db8f68.tar.bz2
lilv-9433514017ae237fb3931c5034945be4f0db8f68.zip
Override pkg-config dependency within meson
-rw-r--r--NEWS3
-rw-r--r--meson.build22
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 <d@drobilla.net> Wed, 05 Oct 2022 19:46:05 +0000
+ -- David Robillard <d@drobilla.net> 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')