diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-05-18 12:07:22 +0000 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-05-26 12:34:18 +0200 |
| commit | c53648abba167db47827840bbd4257ed7bc6133c (patch) | |
| tree | 23b20c1c71221870e7e9238082580018d2c80f87 /ui | |
| parent | 58e48b2e721dcf70571d293e86c02eedbe3a0f39 (diff) | |
| download | qemu-c53648abba167db47827840bbd4257ed7bc6133c.zip qemu-c53648abba167db47827840bbd4257ed7bc6133c.tar.gz qemu-c53648abba167db47827840bbd4257ed7bc6133c.tar.bz2 | |
meson: use subproject for keycodemapdb
By using a subproject, our own meson.build can use variables from
the subproject instead of hard-coded paths. This is also the first step
towards managing downloads with .wrap files instead of submodule.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'ui')
| m--------- | ui/keycodemapdb | 0 | ||||
| -rw-r--r-- | ui/meson.build | 8 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/keycodemapdb b/ui/keycodemapdb deleted file mode 160000 -Subproject f5772a62ec52591ff6870b7e8ef32482371f22c diff --git a/ui/meson.build b/ui/meson.build index 3303697..e09b616 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -162,15 +162,15 @@ keymaps = [ ] if have_system or xkbcommon.found() + keycodemapdb_proj = subproject('keycodemapdb', required: true) foreach e : keymaps output = 'input-keymap-@0@-to-@1@.c.inc'.format(e[0], e[1]) genh += custom_target(output, output: output, capture: true, - input: files('keycodemapdb/data/keymaps.csv'), - command: [python, files('keycodemapdb/tools/keymap-gen'), - 'code-map', - '--lang', 'glib2', + input: keycodemapdb_proj.get_variable('keymaps_csv'), + command: [python, keycodemapdb_proj.get_variable('keymap_gen').full_path(), + 'code-map', '--lang', 'glib2', '--varname', 'qemu_input_map_@0@_to_@1@'.format(e[0], e[1]), '@INPUT0@', e[0], e[1]]) endforeach |