[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v8 150/152] meson: avoid unstable module warning with Meson 0.56.0
From: |
Paolo Bonzini |
Subject: |
[PULL v8 150/152] meson: avoid unstable module warning with Meson 0.56.0 or newer |
Date: |
Fri, 21 Aug 2020 06:23:27 -0400 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 62bf8a51c2..808f50b07e 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,11 @@ project('qemu', ['c'], meson_version: '>=0.55.0',
version: run_command('head', meson.source_root() /
'VERSION').stdout().strip())
not_found = dependency('', required: false)
-keyval = import('unstable-keyval')
+if meson.version().version_compare('>=0.56.0')
+ keyval = import('keyval')
+else
+ keyval = import('unstable-keyval')
+endif
ss = import('sourceset')
sh = find_program('sh')
--
2.26.2
- [PULL v8 139/152] remove Makefile.target, (continued)
- [PULL v8 139/152] remove Makefile.target, Paolo Bonzini, 2020/08/21
- [PULL v8 146/152] meson: convert sample plugins, Paolo Bonzini, 2020/08/21
- [PULL v8 145/152] meson: replace create-config with meson configure_file, Paolo Bonzini, 2020/08/21
- [PULL v8 137/152] meson: convert systemtap files, Paolo Bonzini, 2020/08/21
- [PULL v8 142/152] meson: build texi doc, Paolo Bonzini, 2020/08/21
- [PULL v8 141/152] docs: automatically track manual dependencies, Paolo Bonzini, 2020/08/21
- [PULL v8 149/152] meson: convert po/, Paolo Bonzini, 2020/08/21
- [PULL v8 143/152] meson: convert check-block, Paolo Bonzini, 2020/08/21
- [PULL v8 148/152] meson: convert VNC and dependent libraries to meson, Paolo Bonzini, 2020/08/21
- [PULL v8 144/152] rules.mak: drop unneeded macros, Paolo Bonzini, 2020/08/21
- [PULL v8 150/152] meson: avoid unstable module warning with Meson 0.56.0 or newer,
Paolo Bonzini <=
- [PULL v8 151/152] meson: update build-system documentation, Paolo Bonzini, 2020/08/21
- [PULL v8 140/152] meson: sphinx-build, Paolo Bonzini, 2020/08/21
- [PULL v8 152/152] docs: convert build system documentation to rST, Paolo Bonzini, 2020/08/21