summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Johanson <peter@peterjohanson.com>2021-10-18 02:50:11 +0000
committerPete Johanson <peter@peterjohanson.com>2021-10-18 20:08:35 -0400
commit742f4c28268c80a0e9682532cd938d1e0886ee72 (patch)
tree61777b1bffd77e94c68448ecea35418b347a88da
parent01d2102c2326b86b0f87bb008c2a3eb3871e3963 (diff)
fix(keymaps): Properly locate split board keymaps.
* Find the unified keymap filename for onboard controller split keyboards.
-rw-r--r--app/cmake/zmk_config.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/cmake/zmk_config.cmake b/app/cmake/zmk_config.cmake
index 145352a..4cf43e0 100644
--- a/app/cmake/zmk_config.cmake
+++ b/app/cmake/zmk_config.cmake
@@ -67,6 +67,7 @@ foreach(root ${BOARD_ROOT})
NO_DEFAULT_PATH
)
if(BOARD_DIR)
+ get_filename_component(BOARD_DIR_NAME ${BOARD_DIR} NAME)
list(APPEND KEYMAP_DIRS ${BOARD_DIR})
endif()
@@ -130,7 +131,7 @@ endif()
if(NOT KEYMAP_FILE)
foreach(keymap_dir ${KEYMAP_DIRS})
- foreach(keymap_prefix ${SHIELD} ${SHIELD_DIR} ${BOARD} ${BOARD_DIR})
+ foreach(keymap_prefix ${SHIELD} ${SHIELD_DIR} ${BOARD} ${BOARD_DIR_NAME})
if (EXISTS ${keymap_dir}/${keymap_prefix}.keymap)
set(KEYMAP_FILE "${keymap_dir}/${keymap_prefix}.keymap" CACHE STRING "Selected keymap file")
message(STATUS "Using keymap file: ${KEYMAP_FILE}")