mirror
/
micropython
kopia lustrzana https://github.com/micropython/micropython
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge 2651a969fe into 7b050b366b

John Gentilin 2024-04-25 22:52:05 +02:00 zatwierdzone przez GitHub
rodzic 7b050b366b 2651a969fe
commit a1fc60ae98
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
2 zmienionych plików z 17 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
ports/esp32/CMakeLists.txt
Wyświetl plik

@ -57,7 +57,13 @@ set(SDKCONFIG_DEFAULTS ${CMAKE_BINARY_DIR}/sdkconfig.combined)
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
# Set the location of the main component for the project (one per target).
list(APPEND EXTRA_COMPONENT_DIRS main_${IDF_TARGET})
if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/${MICROPY_BOARD}_main_${IDF_TARGET})
message("Including main Dir: ${MICROPY_BOARD}_main_${IDF_TARGET}")
list(APPEND EXTRA_COMPONENT_DIRS ${MICROPY_BOARD}_main_${IDF_TARGET})
else()
message("Including main Dir: main_${IDF_TARGET}")
list(APPEND EXTRA_COMPONENT_DIRS main_${IDF_TARGET})
endif()
# Define the project.
project(micropython)
project(micropython_${MICROPY_BOARD})

10
py/usermod.cmake
Wyświetl plik

@ -36,7 +36,15 @@ function(usermod_gather_sources SOURCES_VARNAME INCLUDE_DIRECTORIES_VARNAME INCL
endfunction()
# Include CMake files for user modules.
if (USER_C_MODULES)
if (EXISTS ${USER_C_MODULES}/${MICROPY_BOARD}_micropython.cmake)
message("Including User C Module(s) from ${USER_C_MODULE_PATH} for Board ${MICROPY_BOARD}")
include(${USER_C_MODULES}/${MICROPY_BOARD}_micropython.cmake)
elseif(EXISTS ${USER_C_MODULES}/micropython.cmake)
message("Including User C Module(s) from ${USER_C_MODULE_PATH} from micropython.cnake")
include(${USER_C_MODULES}/micropython.cmake)
elseif (USER_C_MODULES)
foreach(USER_C_MODULE_PATH ${USER_C_MODULES})
message("Including User C Module(s) from ${USER_C_MODULE_PATH}")
include(${USER_C_MODULE_PATH})