Skip to content
Snippets Groups Projects
Commit 795318c8 authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

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: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
parent 57733fe6
No related branches found
No related tags found
Loading
......@@ -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,
......
Subproject commit e15649b83a78f89f57205927022115536d2c1698
Subproject commit 14cdba29ecd7448310fe4ff890e67830b1a40f64
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment