1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
| | Meson fails to detect bitsery, function2 and gulrak-filesystem.
https://github.com/robbert-vdh/yabridge/issues/18
From c3cb50cff354c585afc3c94e676ac50a420e871b Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@proton.me>
Date: Sun, 23 Apr 2023 08:44:50 +0200
Subject: [PATCH] Fix dependency search
---
meson.build | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/meson.build b/meson.build
index f76f5acf..ca85af68 100644
--- a/meson.build
+++ b/meson.build
@@ -248,22 +248,13 @@ else
asio_dep = dependency('asio', version : '>=1.22.0')
endif
-if meson.version().version_compare('>=0.60')
- # Bitsery's CMake build definition is capitalized for some reason
- bitsery_dep = dependency('bitsery', 'Bitsery', version : '>=5.2.0')
-else
- # Mmeson <=0.6.0 didn't support multiple names for a dependency, and since at
- # the moment this is only relevant for packing on Arch btw, it's probably
- # better to remove this conditional later than it is to bump the minimum Meson
- # version now.
- bitsery_dep = dependency('bitsery', version : '>=5.2.0')
-endif
+bitsery_dep = declare_dependency()
# The D-Bus headers are also only accessed through the include path. We don't
# link to libdbus-1 to make soname changes don't completely break yabridge.
dbus_dep = dependency('dbus-1').partial_dependency(compile_args : true, includes : true)
-function2_dep = dependency('function2', version : '>=4.0.0')
-ghc_filesystem_dep = dependency('ghc_filesystem', modules : 'ghcFilesystem::ghc_filesystem', version : '>=1.5.0')
+function2_dep = declare_dependency()
+ghc_filesystem_dep = declare_dependency()
threads_dep = dependency('threads')
# Tomlplusplus recently added a shraed library version. We don't want to link to that.
tomlplusplus_dep = dependency('tomlplusplus', version : '>=3.3.0', default_options : ['compile_library=false']).partial_dependency(compile_args : true, includes : true)
--
2.39.2
|