Move src/keycodemapdb -> subprojects/keycodemapdb

Follow better meson build system conventions. This allows to find
keymap-gen or CSV without explicitly setting the paths.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Marc-André Lureau 2023-04-17 15:54:01 +04:00 committed by Michal Privoznik
parent c4ec51edd6
commit 883b427acf
4 changed files with 4 additions and 3 deletions

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "keycodemapdb"] [submodule "keycodemapdb"]
path = src/keycodemapdb path = subprojects/keycodemapdb
url = https://gitlab.com/keycodemap/keycodemapdb.git url = https://gitlab.com/keycodemap/keycodemapdb.git

View File

@ -2028,6 +2028,7 @@ runutf8 = [ 'LC_ALL=', 'LANG=C', 'LC_CTYPE=en_US.UTF-8' ]
top_inc_dir = include_directories('.') top_inc_dir = include_directories('.')
keycodemapdb = subproject('keycodemapdb')
# include remaining subdirs # include remaining subdirs

View File

@ -138,8 +138,8 @@ keyname_list = [
'win32', 'win32',
] ]
keymap_gen_prog = find_program('keymap-gen', dirs: [meson.project_source_root() / 'src' / 'keycodemapdb' / 'tools' ]) keymap_gen_prog = find_program('keymap-gen')
keymap_src_file = '@0@/src/keycodemapdb/data/keymaps.csv'.format(meson.project_source_root()) keymap_src_file = keycodemapdb.get_variable('keymaps_csv')
foreach name : keycode_list foreach name : keycode_list
keycode_gen_sources += custom_target( keycode_gen_sources += custom_target(