[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 148/150] meson: avoid unstable module warning with Meson 0.56.0 or
From: |
Paolo Bonzini |
Subject: |
[PULL 148/150] meson: avoid unstable module warning with Meson 0.56.0 or newer |
Date: |
Tue, 18 Aug 2020 10:10:23 -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 57cfa8723d..94bfaa6290 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 131/150] meson: bsd-user, (continued)
- [PULL 131/150] meson: bsd-user, Paolo Bonzini, 2020/08/18
- [PULL 125/150] meson: convert hw/acpi, Paolo Bonzini, 2020/08/18
- [PULL 127/150] meson: convert hw/arch*, Paolo Bonzini, 2020/08/18
- [PULL 133/150] meson: plugins, Paolo Bonzini, 2020/08/18
- [PULL 141/150] meson: convert check-block, Paolo Bonzini, 2020/08/18
- [PULL 135/150] meson: convert systemtap files, Paolo Bonzini, 2020/08/18
- [PULL 147/150] meson: convert po/, Paolo Bonzini, 2020/08/18
- [PULL 144/150] meson: convert sample plugins, Paolo Bonzini, 2020/08/18
- [PULL 119/150] meson: convert hw/display, Paolo Bonzini, 2020/08/18
- [PULL 136/150] rules.mak: remove version.o, Paolo Bonzini, 2020/08/18
- [PULL 148/150] meson: avoid unstable module warning with Meson 0.56.0 or newer,
Paolo Bonzini <=
- [PULL 145/150] meson: move SDL and SDL-image detection to meson, Paolo Bonzini, 2020/08/18
- [PULL 146/150] meson: convert VNC and dependent libraries to meson, Paolo Bonzini, 2020/08/18
- [PULL 139/150] docs: automatically track manual dependencies, Paolo Bonzini, 2020/08/18
- [PULL 132/150] meson: cpu-emu, Paolo Bonzini, 2020/08/18
- [PULL 130/150] meson: linux-user, Paolo Bonzini, 2020/08/18
- [PULL 134/150] meson: link emulators without Makefile.target, Paolo Bonzini, 2020/08/18
- [PULL 137/150] remove Makefile.target, Paolo Bonzini, 2020/08/18
- [PULL 143/150] meson: replace create-config with meson configure_file, Paolo Bonzini, 2020/08/18
- [PULL 149/150] meson: update build-system documentation, Paolo Bonzini, 2020/08/18
- [PULL 140/150] meson: build texi doc, Paolo Bonzini, 2020/08/18