Merge branch 'cmake-experiments' of https://github.com/qmk/qmk_firmware into cmake-experiments

CMakeLists.txt

@@ -4,7 +4,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 include(UpdateSubmodule)
 include(ResolveKeyboard)
-include(ValidateJSON)
+include(ValidateJson)
 
 set(QMK_KEYBOARDS_FOLDER "${CMAKE_SOURCE_DIR}/keyboards")
 
@@ -102,4 +102,4 @@ add_subdirectory(tmk_core/protocol)
 include(features/oled)
 include(features/backlight)
 
-endif()
+endif()

cmake/AddKeyboard.cmake

@@ -1,5 +1,5 @@
 include(ResolveKeyboard)
-include(ValidateJSON)
+include(ValidateJson)
 include(ResolveToolchain)
 
 macro(add_keyboard KEYBOARD_FOLDER KEYMAP_FOLDER)  
@@ -73,4 +73,4 @@ macro(add_keyboard KEYBOARD_FOLDER KEYMAP_FOLDER)
   )
   
 # file(APPEND "${CMAKE_SOURCE_DIR}/build/targets" "${TARGET_NAME}|${KEYBOARD_NAME} with ${KEYMAP_FOLDER}|${KEYBOARD_FOLDER}|Made by: ${MANUFACTURER}\n")
-endmacro(add_keyboard)
+endmacro(add_keyboard)

keyboards/CMakeLists.txt

@@ -1,7 +1,9 @@
 include(ExternalProject)
 include(AddKeyboard)
-  
-# file(WRITE "${CMAKE_SOURCE_DIR}/build/targets" "")
+
+if(NOT EXISTS "${CMAKE_SOURCE_DIR}/build/targets")
+  file(WRITE "${CMAKE_SOURCE_DIR}/build/targets" "")
+endif()
 
 # if(DEFINED QMK_KEYBOARD_FOLDER)
 #   if(NOT DEFINED QMK_KEYMAP_FOLDER)
@@ -37,4 +39,4 @@ foreach(KEYBOARD_INFO ${POSSIBLE_KEYBOARDS})
   get_filename_component(KEYBOARD_FOLDER_ABS "${KEYBOARD_INFO}" DIRECTORY)
   file(RELATIVE_PATH KEYBOARD_FOLDER "${CMAKE_SOURCE_DIR}/keyboards" "${KEYBOARD_FOLDER_ABS}")
   file(APPEND "${CMAKE_SOURCE_DIR}/build/all_keyboards" "${KEYBOARD_FOLDER}\n")
-endforeach()
+endforeach()