From 94d76a4f9e7cc10752853bfc1f6d3711c8cd6cd0 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 4 Apr 2023 16:55:03 -0400 Subject: [PATCH] fix case issues --- CMakeLists.txt | 4 ++-- cmake/AddKeyboard.cmake | 4 ++-- keyboards/CMakeLists.txt | 8 +++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ffd2f24044..85e96ebab7b 100644 --- a/CMakeLists.txt +++ b/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() \ No newline at end of file +endif() diff --git a/cmake/AddKeyboard.cmake b/cmake/AddKeyboard.cmake index 013d8a15b90..51d5ac68309 100644 --- a/cmake/AddKeyboard.cmake +++ b/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) \ No newline at end of file +endmacro(add_keyboard) diff --git a/keyboards/CMakeLists.txt b/keyboards/CMakeLists.txt index 4e6df9c6f6d..b9f068fb21d 100644 --- a/keyboards/CMakeLists.txt +++ b/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() \ No newline at end of file +endforeach()