kopia lustrzana https://github.com/micropython/micropython
Merge 2651a969fe
into a521df27dc
commit
bad671f085
|
@ -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})
|
||||
|
|
|
@ -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})
|
||||
|
|
Ładowanie…
Reference in New Issue