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>
zippy2 · Apr 17, 2023 · 883b427 · 883b427
1 parent c4ec51e
commit 883b427
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "keycodemapdb"]
-	path = src/keycodemapdb
+	path = subprojects/keycodemapdb
 	url = https://gitlab.com/keycodemap/keycodemapdb.git
diff --git a/meson.build b/meson.build
@@ -2028,6 +2028,7 @@ runutf8 = [ 'LC_ALL=', 'LANG=C', 'LC_CTYPE=en_US.UTF-8' ]
 
 top_inc_dir = include_directories('.')
 
+keycodemapdb = subproject('keycodemapdb')
 
 # include remaining subdirs
 

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

diff --git a/src/keycodemapdb → subprojects/keycodemapdb b/src/keycodemapdb → subprojects/keycodemapdb