unknown state

cmake/AddKeyboard.cmake

@@ -1,18 +1,27 @@
+include(ResolveKeyboard)
+include(ValidateJSON)
+
 macro(add_keyboard KEYBOARD_FOLDER KEYMAP_FOLDER)  
   # not entirely sure why this is necessary
+  # set(TEMP_PATH ${KEYBOARD_FOLDER})
+  # cmake_path(IS_RELATIVE TEMP_PATH IS_KEYBOARD_FOLDER_RELATIVE)
+  # if(${IS_KEYBOARD_FOLDER_RELATIVE})
+  #   set(KEYBOARD_FOLDER_ABS ${CMAKE_SOURCE_DIR}/keyboards/${KEYBOARD_FOLDER})
+  #   if(NOT EXISTS ${KEYBOARD_FOLDER_ABS})
+  #     # message(FATAL_ERROR "Keyboard does not exist in QMK - try using an absolute path to the keyboard folder")
+  #     resolve_keyboard(${KEYBOARD_FOLDER} KEYBOARD_FOLDER_ABS)
+  #   endif()
+  # else()
+  #   set(KEYBOARD_FOLDER_ABS ${KEYBOARD_FOLDER})
+  #   if(NOT EXISTS ${KEYBOARD_FOLDER_ABS})
+  #     message(FATAL_ERROR "Absolute path to keyboard does not exist")
+  #   endif()
+  # endif()
+ 
+  resolve_keyboard(${KEYBOARD_FOLDER} KEYBOARD_FOLDER_ABS)
+
   set(TEMP_PATH ${KEYBOARD_FOLDER})
   cmake_path(IS_RELATIVE TEMP_PATH IS_KEYBOARD_FOLDER_RELATIVE)
-  if(${IS_KEYBOARD_FOLDER_RELATIVE})
-    set(KEYBOARD_FOLDER_ABS ${CMAKE_SOURCE_DIR}/keyboards/${KEYBOARD_FOLDER})
-    if(NOT EXISTS ${KEYBOARD_FOLDER_ABS})
-      message(FATAL_ERROR "Keyboard does not exist in QMK - try using an absolute path to the keyboard folder")
-    endif()
-  else()
-    set(KEYBOARD_FOLDER_ABS ${KEYBOARD_FOLDER})
-    if(NOT EXISTS ${KEYBOARD_FOLDER_ABS})
-      message(FATAL_ERROR "Absolute path to keyboard does not exist")
-    endif()
-  endif()
   
   set(TEMP_PATH ${KEYMAP_FOLDER})
   cmake_path(IS_RELATIVE TEMP_PATH IS_KEYMAP_FOLDER_RELATIVE)
@@ -29,12 +38,12 @@ macro(add_keyboard KEYBOARD_FOLDER KEYMAP_FOLDER)
   # find the right toolchain
 
   # not sure we need to validate here
-  include(ValidateJSON)
   validate_json(${KEYBOARD_FOLDER_ABS}/info.json keyboard JSON_STRING)
 
   string(JSON PROCESSOR GET ${JSON_STRING} processor)
   if(${PROCESSOR} MATCHES "^at.*")
     set(PLATFORM "avr")
+    set(TOOLCHAIN "avr")
     include(FindAVRToolchain)
     find_avr_toolchain()
   elseif(
@@ -44,6 +53,7 @@ macro(add_keyboard KEYBOARD_FOLDER KEYMAP_FOLDER)
     ${PROCESSOR} MATCHES "RP2040" OR
     ${PROCESSOR} MATCHES "^GD32.*")
     set(PLATFORM "chibios")
+    set(TOOLCHAIN "arm-none-eabi")
     include(FindARMToolchain)
     find_arm_toolchain()
   endif()
@@ -71,7 +81,7 @@ macro(add_keyboard KEYBOARD_FOLDER KEYMAP_FOLDER)
     # this seems to work well for all systems so far - not sure if it'd be useful to customize
     CMAKE_GENERATOR "Unix Makefiles"
     CMAKE_ARGS 
-      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/platforms/${PLATFORM}/toolchain.cmake
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/toolchains/${TOOLCHAIN}.cmake
       -DTOOLCHAIN_ROOT=${TOOLCHAIN_ROOT}
       -DMAKE_ROOT=${MAKE_ROOT}
       -DQMK_KEYBOARD=${KEYBOARD_NAME}