diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-01-23 11:38:43 +0400 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-01-23 11:55:06 +0400 |
| commit | 795318c8fad0288d86bd6a392c0f82be60d4b9da (patch) | |
| tree | 9d1487c97b5b92b6c5bbe091bfe49f79bc79ad34 | |
| parent | 57733fe6ef55d29c487d0b103c755e463a076416 (diff) | |
meson: fix keymap-gen exec on msys
meson wraps python scripts already on win32:
"C:/msys64/mingw64/bin/meson" "--internal" "exe" "--capture" "src/vncdisplaykeymap_xorgevdev2xtkbd.h" "--" "C:/msys64/mingw64/bin/python.exe" "python" "C:/msys64/home/marca/src/spice-gtk/subprojects/keycodemapdb/tools/keymap-gen" "code-m
ap" "--lang" "glib2" "--varname" "keymap_xorgevdev2xtkbd" "../subprojects/keycodemapdb/data/keymaps.csv" "xorgevdev" "xtkbd"
--- stderr ---
C:/msys64/mingw64/bin/python.exe: can't open file 'C:\\msys64\\home\\marca\\src\\spice-gtk\\build\\python': [Errno 2] No such file or directory
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
| -rw-r--r-- | src/meson.build | 3 | ||||
| m--------- | subprojects/keycodemapdb | 0 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/meson.build b/src/meson.build index 25d379a..9811c65 100644 --- a/src/meson.build +++ b/src/meson.build @@ -300,7 +300,6 @@ if spice_gtk_has_gtk endif # keymaps - python = import('python').find_installation() keymaps = ['xorgevdev', 'xorgkbd', 'xorgxquartz', @@ -312,7 +311,7 @@ if spice_gtk_has_gtk foreach keymap : keymaps varname = 'keymap_@0@2xtkbd'.format(keymap) target = 'vncdisplay@0@.h'.format(varname) - cmd = [python, keymapgen, 'code-map', '--lang', 'glib2', '--varname', varname, keymapcsv, keymap, 'xtkbd'] + cmd = [keymapgen, 'code-map', '--lang', 'glib2', '--varname', varname, keymapcsv, keymap, 'xtkbd'] spice_client_gtk_sources += custom_target(target, output : target, capture : true, diff --git a/subprojects/keycodemapdb b/subprojects/keycodemapdb -Subproject e15649b83a78f89f57205927022115536d2c169 +Subproject 14cdba29ecd7448310fe4ff890e67830b1a40f6 |