summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--meson.build17
2 files changed, 8 insertions, 12 deletions
diff --git a/NEWS b/NEWS
index 97d0c8e..585b8b7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,9 @@
sratom (0.6.15) 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:44:43 +0000
+ -- David Robillard <d@drobilla.net> Fri, 07 Oct 2022 17:28:31 +0000
sratom (0.6.14) stable; urgency=medium
diff --git a/meson.build b/meson.build
index 6363056..263293a 100644
--- a/meson.build
+++ b/meson.build
@@ -36,17 +36,9 @@ subdir('meson/suppressions')
m_dep = cc.find_library('m', required: false)
-lv2_dep = dependency('lv2',
- version: '>= 1.18.4',
- 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'])
+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.4')
###########
# Library #
@@ -95,6 +87,9 @@ pkg.generate(
version: meson.project_version(),
)
+# Override pkg-config dependency for internal meson dependants
+meson.override_dependency(versioned_name, sratom_dep)
+
# Install header to a versioned include directory
install_headers(c_headers, subdir: versioned_name / 'sratom')