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

This commit is contained in:
Jack Humbert 2023-04-04 20:55:17 -04:00
commit 4d1ad14596
3 changed files with 9 additions and 7 deletions

View File

@ -4,7 +4,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
include(UpdateSubmodule) include(UpdateSubmodule)
include(ResolveKeyboard) include(ResolveKeyboard)
include(ValidateJSON) include(ValidateJson)
set(QMK_KEYBOARDS_FOLDER "${CMAKE_SOURCE_DIR}/keyboards") set(QMK_KEYBOARDS_FOLDER "${CMAKE_SOURCE_DIR}/keyboards")

View File

@ -1,5 +1,5 @@
include(ResolveKeyboard) include(ResolveKeyboard)
include(ValidateJSON) include(ValidateJson)
include(ResolveToolchain) include(ResolveToolchain)
macro(add_keyboard KEYBOARD_FOLDER KEYMAP_FOLDER) macro(add_keyboard KEYBOARD_FOLDER KEYMAP_FOLDER)

View File

@ -1,7 +1,9 @@
include(ExternalProject) include(ExternalProject)
include(AddKeyboard) 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(DEFINED QMK_KEYBOARD_FOLDER)
# if(NOT DEFINED QMK_KEYMAP_FOLDER) # if(NOT DEFINED QMK_KEYMAP_FOLDER)