From 583839afce4b8117e3ae7bd644954b03d0ed3ddf Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Sat, 13 Jun 2020 16:37:31 -0400 Subject: Initial refactor to have a shield/board have one default keymap. * Start of work of focusing on out-of-tree user keymaps. Add ZMK_CONFIG support. * General external configuration supported via ZMK_CONFIG, which should point to a configuration directory. * Priority order of overlay files to select. * ${SHIELD}_${BOARD}.overlay * ${SHIELD}.overlay * ${BOARD}.overlay * default.overlay * Equivalent search order for .conf files for initial Kconfig values. --- app/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/CMakeLists.txt') diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index c5868ee..ed2c28c 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -12,9 +12,9 @@ list(APPEND ZEPHYR_EXTRA_MODULES ) list(APPEND SYSCALL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/drivers/zephyr) -include(cmake/keymap.cmake) +include(cmake/zmk_config.cmake) -find_package(Zephyr) +find_package(Zephyr REQUIRED HINTS ../zephyr) project(zmk) -- cgit v1.2.3