djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extmod/extmod.cmake: Require components to be explicitly enabled. 

Otherwise include directories are added unconditionally to the build
variables if the component (submodule) is checked out.  This can lead to,
eg, the esp32 build using lib/lwip header files, instead of lwip header
files from the IDF.

Fixes issue #8727.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2022-06-08 12:21:51 +10:00
parent e8e8c7c354
commit bd375df02c
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extmod/extmod.cmake
View File

@ -54,9 +54,9 @@ set(MICROPY_SOURCE_EXTMOD
# Library for btree module and associated code # Library for btree module and associated code
if(MICROPY_PY_BTREE)
set(MICROPY_LIB_BERKELEY_DIR "${MICROPY_DIR}/lib/berkeley-db-1.xx") set(MICROPY_LIB_BERKELEY_DIR "${MICROPY_DIR}/lib/berkeley-db-1.xx")
if(EXISTS "${MICROPY_LIB_BERKELEY_DIR}/btree/bt_close.c")
add_library(micropy_extmod_btree OBJECT add_library(micropy_extmod_btree OBJECT
${MICROPY_LIB_BERKELEY_DIR}/btree/bt_close.c ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_close.c
${MICROPY_LIB_BERKELEY_DIR}/btree/bt_conv.c ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_conv.c
@ -100,11 +100,11 @@ endif()
# Library for mbedtls # Library for mbedtls
set(MICROPY_LIB_MBEDTLS_DIR "${MICROPY_DIR}/lib/mbedtls") if(MICROPY_SSL_MBEDTLS)
if(EXISTS "${MICROPY_LIB_MBEDTLS_DIR}/library/aes.c")
add_library(micropy_lib_mbedtls INTERFACE) add_library(micropy_lib_mbedtls INTERFACE)
set(MICROPY_LIB_MBEDTLS_DIR "${MICROPY_DIR}/lib/mbedtls")
target_include_directories(micropy_lib_mbedtls INTERFACE target_include_directories(micropy_lib_mbedtls INTERFACE
${MICROPY_LIB_MBEDTLS_DIR}/include ${MICROPY_LIB_MBEDTLS_DIR}/include
) )
@ -194,11 +194,11 @@ endif()
# Library for lwIP network stack # Library for lwIP network stack
set(MICROPY_LIB_LWIP_DIR "${MICROPY_DIR}/lib/lwip/src") if(MICROPY_PY_LWIP)
if(EXISTS "${MICROPY_LIB_LWIP_DIR}/core/def.c")
add_library(micropy_lib_lwip INTERFACE) add_library(micropy_lib_lwip INTERFACE)
set(MICROPY_LIB_LWIP_DIR "${MICROPY_DIR}/lib/lwip/src")
target_include_directories(micropy_lib_lwip INTERFACE target_include_directories(micropy_lib_lwip INTERFACE
${MICROPY_LIB_LWIP_DIR}/include ${MICROPY_LIB_LWIP_DIR}/include
) )

4
ports/esp32/main/CMakeLists.txt
View File

@ -7,6 +7,10 @@ endif()
include(${MICROPY_DIR}/py/py.cmake) include(${MICROPY_DIR}/py/py.cmake)
if(NOT CMAKE_BUILD_EARLY_EXPANSION) if(NOT CMAKE_BUILD_EARLY_EXPANSION)
# Enable extmod components that will be configured by extmod.cmake.
# A board may also have enabled additional components.
set(MICROPY_PY_BTREE ON)
include(${MICROPY_DIR}/py/usermod.cmake) include(${MICROPY_DIR}/py/usermod.cmake)
include(${MICROPY_DIR}/extmod/extmod.cmake) include(${MICROPY_DIR}/extmod/extmod.cmake)
endif() endif()

4
ports/rp2/CMakeLists.txt
View File

@ -43,6 +43,10 @@ if(NOT PICO_BOARD)
string(TOLOWER ${MICROPY_BOARD} PICO_BOARD) string(TOLOWER ${MICROPY_BOARD} PICO_BOARD)
endif() endif()
# Enable extmod components that will be configured by extmod.cmake.
# A board may also have enabled additional components.
set(MICROPY_SSL_MBEDTLS ON)
# Include component cmake fragments # Include component cmake fragments
include(${MICROPY_DIR}/py/py.cmake) include(${MICROPY_DIR}/py/py.cmake)
include(${MICROPY_DIR}/extmod/extmod.cmake) include(${MICROPY_DIR}/extmod/extmod.cmake)