summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels De Graef <nielsdegraef@gmail.com>2020-02-03 08:57:52 +0100
committerNiels De Graef <nielsdegraef@gmail.com>2020-02-04 06:04:26 +0000
commit1853567d79024c6ce960d9dc187cff8aaf9a37ce (patch)
tree5d636d0786f4d47e81fc23890285d678567d7a36
parent2827fded2470dd89f8840e2b5d4b56aa43959460 (diff)
downloadfolks-1853567d79024c6ce960d9dc187cff8aaf9a37ce.tar.gz
meson: Use python.dependency() correctly
From https://github.com/mesonbuild/meson/issues/6470: > So, to further clarify, passing an argument to > py_installation.dependency() should be an error, since this method > will only ever return a python dependency (for embedding python > itself, etc.) and not dbusmock or anything else. Fixxes https://gitlab.gnome.org/GNOME/folks/issues/119
-rw-r--r--meson.build9
1 files changed, 6 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index d5115e28..f3644457 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
project('folks', [ 'vala', 'c' ],
version: '0.13.2',
license: 'LGPL2.1+',
- meson_version: '>= 0.49',
+ meson_version: '>= 0.51',
)
gnome = import('gnome')
@@ -132,8 +132,11 @@ if bluez_backend_enabled
libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version)
# Needed for the BlueZ tests
pymod = import('python')
- py_installation = pymod.find_installation('python3')
- python_dbusmock = py_installation.dependency('dbusmock')
+ py_installation = pymod.find_installation('python3',
+ modules: [
+ 'dbusmock',
+ ],
+ )
endif
if import_tool_enabled