From: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
Follow meson build system conventions.
This will allow meson to handle it as a subproject.
Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
---
.gitmodules | 4 ++--
meson.build | 6 +++++-
src/meson.build | 2 --
{src => subprojects}/keycodemapdb | 0
4 files changed, 7 insertions(+), 5 deletions(-)
rename {src => subprojects}/keycodemapdb (100%)
diff --git a/.gitmodules b/.gitmodules
index 6938cd0..a7804e6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
[submodule "spice-common"]
path = subprojects/spice-common
url = ../spice-common.git
-[submodule "src/keycodemapdb"]
- path = src/keycodemapdb
+[submodule "subprojects/keycodemapdb"]
+ path = subprojects/keycodemapdb
url = https://gitlab.com/keycodemap/keycodemapdb.git
diff --git a/meson.build b/meson.build
index 70dd318..29d5fed 100644
--- a/meson.build
+++ b/meson.build
@@ -36,12 +36,16 @@ spice_gtk_deps = []
spice_acl_deps = []
#
-# Spice common subproject
+# Set up subprojects
#
spice_common = subproject('spice-common', default_options : ['generate-code=client'])
spice_gtk_config_data.merge_from(spice_common.get_variable('spice_common_config_data'))
spice_glib_deps += spice_common.get_variable('spice_common_client_dep')
+subproject('keycodemapdb', required : false)
+keymapgen = files('subprojects/keycodemapdb/tools/keymap-gen')
+keymapcsv = files('subprojects/keycodemapdb/data/keymaps.csv')
+
#
# check for system headers
#
diff --git a/src/meson.build b/src/meson.build
index e580429..749a6f8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -299,8 +299,6 @@ if spice_gtk_has_gtk
# keymaps
python = import('python3').find_python()
- keymapgen = files('./keycodemapdb/tools/keymap-gen')
- keymapcsv = files('./keycodemapdb/data/keymaps.csv')
keymaps = ['xorgevdev',
'xorgkbd',
'xorgxquartz',
diff --git a/src/keycodemapdb b/subprojects/keycodemapdb
similarity index 100%
rename from src/keycodemapdb
rename to subprojects/keycodemapdb
--
2.20.1.98.gecbdaf0899
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel