From c53648abba167db47827840bbd4257ed7bc6133c Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 18 May 2023 12:07:22 +0000 Subject: meson: use subproject for keycodemapdb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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é Signed-off-by: Paolo Bonzini --- ui/keycodemapdb | 1 - ui/meson.build | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) delete mode 160000 ui/keycodemapdb (limited to 'ui') diff --git a/ui/keycodemapdb b/ui/keycodemapdb deleted file mode 160000 index f5772a6..0000000 --- a/ui/keycodemapdb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f5772a62ec52591ff6870b7e8ef32482371f22c6 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 -- cgit v1.1