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>

diff --git a/.gitmodules b/.gitmodules
index 79b7e194858bb850b933e716207f880ce8cb163c..7bee6175059887f67365d982feecf9f1e78bef0b 100644 (file)
--- 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
index f7f31a278d5f7b93527eed8986e3126d03bcd287..de087666f574c914e1dcd18728f82dddf9b800c2 100644 (file)
--- 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
index c6b1294f24750b5483bc7607b1460b205e24dbc4..c2175f10986e317629ca2ece8ef5db6f224139f7 100644 (file)
--- 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 b/subprojects/keycodemapdb
similarity index 100%
rename from src/keycodemapdb
rename to subprojects/keycodemapdb