github-featured/78--xiaozhi-esp32
2
0
Fork 0
Code Issues Pull Requests Deployments Models Agent Notes Packages Projects Releases Wiki Activity

fix: defer board validation during CMake early expansion

Browse Source
This commit is contained in:
Xiaoxia
2026-07-27 07:24:54 +08:00
parent c78d7f2568
commit f475b4cbb1
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/CMakeLists.txt
+9 -7
View File
@@ -817,7 +817,7 @@ elseif(CONFIG_BOARD_TYPE_LCDWIKI_ES3C35P)
set(DEFAULT_EMOJI_COLLECTION noto-color-emoji_128)
endif()
if(NOT BOARD_DIR)
if(NOT BOARD_DIR AND NOT CMAKE_BUILD_EARLY_EXPANSION)
message(FATAL_ERROR "The selected board does not define BOARD_DIR")
endif()
@@ -1059,12 +1059,14 @@ if(NOT _font_match)
endif()
set(TEXT_FONT_SIZE "${CMAKE_MATCH_1}")
set(TEXT_FONT_BPP "${CMAKE_MATCH_2}")
target_compile_definitions(${COMPONENT_LIB}
PRIVATE BOARD_TYPE=\"${BOARD_TYPE}\" BOARD_NAME=\"${BOARD_NAME}\"
PRIVATE BOARD_MANUFACTURER=\"${BOARD_MANUFACTURER}\"
PRIVATE BUILTIN_TEXT_FONT=${BUILTIN_TEXT_FONT} BUILTIN_ICON_FONT=${BUILTIN_ICON_FONT}
PRIVATE TEXT_FONT_SIZE=${TEXT_FONT_SIZE} TEXT_FONT_BPP=${TEXT_FONT_BPP}
)
if(NOT CMAKE_BUILD_EARLY_EXPANSION)
target_compile_definitions(${COMPONENT_LIB}
PRIVATE BOARD_TYPE=\"${BOARD_TYPE}\" BOARD_NAME=\"${BOARD_NAME}\"
PRIVATE BOARD_MANUFACTURER=\"${BOARD_MANUFACTURER}\"
PRIVATE BUILTIN_TEXT_FONT=${BUILTIN_TEXT_FONT} BUILTIN_ICON_FONT=${BUILTIN_ICON_FONT}
PRIVATE TEXT_FONT_SIZE=${TEXT_FONT_SIZE} TEXT_FONT_BPP=${TEXT_FONT_BPP}
)
endif()
# Add generation rules
add_custom_command(