kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix flat struct when shield is located in main config dir

Browse source
This commit is contained in:
dumam 2021-11-07 03:18:14 +01:00
parent 5216938ab3
commit f4b6e6c380
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/cmake/zmk_config.cmake
View file

@ -71,7 +71,7 @@ foreach(root ${BOARD_ROOT})
if (NOT DEFINED BOARD_DIR_NAME) if (NOT DEFINED BOARD_DIR_NAME)
find_path(BOARD_DIR find_path(BOARD_DIR
NAMES ${BOARD}_defconfig NAMES ${BOARD}_defconfig
PATHS ${root}/boards/*/* PATHS ${root}/boards/*/* ${root}/boards
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
if(BOARD_DIR) if(BOARD_DIR)
@ -83,13 +83,13 @@ foreach(root ${BOARD_ROOT})
if(DEFINED SHIELD) if(DEFINED SHIELD)
find_path(shields_refs_list find_path(shields_refs_list
NAMES ${SHIELD}.overlay NAMES ${SHIELD}.overlay
PATHS ${root}/boards/shields/* PATHS ${root}/boards/shields/* ${root}
NO_DEFAULT_PATH) NO_DEFAULT_PATH)
foreach(shield_path ${shields_refs_list}) foreach(shield_path ${shields_refs_list})
get_filename_component(SHIELD_DIR_NAME ${shield_path} NAME) get_filename_component(SHIELD_DIR_NAME ${shield_path} NAME)
list(APPEND KEYMAP_DIRS ${shield_path}) list(APPEND KEYMAP_DIRS ${shield_path})
endforeach() endforeach()
# make it consistent with other naming conventions used in project # make it consistent with other naming conventions used in project
set(SHIELD_DIR "${shields_refs_list}") set(SHIELD_DIR "${shields_refs_list}")
endif() endif()