mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
mbedtls: align CMake build with corresponding component.mk
This commit is contained in:
parent
a3785792eb
commit
907b1a9032
@ -30,7 +30,7 @@ if(CONFIG_HEAP_TRACING)
|
||||
heap_caps_realloc_default)
|
||||
|
||||
foreach(wrap ${WRAP_FUNCTIONS})
|
||||
target_link_libraries(heap "-Wl,--wrap=${wrap}")
|
||||
target_link_libraries(${COMPONENT_TARGET} "-Wl,--wrap=${wrap}")
|
||||
endforeach()
|
||||
|
||||
endif()
|
||||
|
@ -21,6 +21,11 @@ include_directories("${COMPONENT_PATH}/port/include")
|
||||
# Import mbedtls library targets
|
||||
add_subdirectory(mbedtls)
|
||||
|
||||
# Use port specific implementation of net_socket.c instead of one from mbedtls
|
||||
get_target_property(src_tls mbedtls SOURCES)
|
||||
list(REMOVE_ITEM src_tls net_sockets.c)
|
||||
set_property(TARGET mbedtls PROPERTY SOURCES ${src_tls})
|
||||
|
||||
set(mbedtls_targets mbedtls mbedcrypto mbedx509)
|
||||
|
||||
# Add port files to mbedtls targets
|
||||
@ -54,4 +59,4 @@ target_link_libraries(${COMPONENT_TARGET} ${mbedtls_targets})
|
||||
# Catch usage of deprecated mbedTLS functions when building tests
|
||||
if(mbedtls_test IN_LIST BUILD_TEST_COMPONENTS)
|
||||
add_definitions(-DMBEDTLS_DEPRECATED_WARNING)
|
||||
endif()
|
||||
endif()
|
||||
|
@ -6,5 +6,5 @@ set(COMPONENT_REQUIRES)
|
||||
register_component()
|
||||
|
||||
if(CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK)
|
||||
target_link_libraries(pthread "-Wl,--wrap=vPortCleanUpTCB")
|
||||
target_link_libraries(${COMPONENT_TARGET} "-Wl,--wrap=vPortCleanUpTCB")
|
||||
endif()
|
||||
|
Loading…
Reference in New Issue
Block a user