Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/convert_to_cmake' into 'master'

Browse source 
Fix minor issue with convert_to_cmake script

See merge request idf/esp-idf!3666
This commit is contained in:
Angus Gratton 2018-12-03 11:39:12 +08:00
parent fffa98647b 907b1a9032
commit 554cf77963
4 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/heap/CMakeLists.txt
View file

@ -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()

7
components/mbedtls/CMakeLists.txt
View file

@ -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()

2
components/pthread/CMakeLists.txt
View file

@ -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()

8
tools/ci/test_build_system_cmake.sh
View file

@ -258,6 +258,14 @@ function run_tests()
mv ${IDF_PATH}/components/esp32/toolchain-esp32.cmake ${IDF_PATH}/tools/cmake/
assert_built ${APP_BINS} ${BOOTLOADER_BINS} ${PARTITION_BIN}
print_status "Can build with auto generated CMakeLists.txt"
clean_build_dir
mv CMakeLists.txt CMakeLists.bak
${IDF_PATH}/tools/cmake/convert_to_cmake.py .
idf.py build || failure "Auto generated CMakeLists.txt build failed"
mv CMakeLists.bak CMakeLists.txt
assert_built ${APP_BINS} ${BOOTLOADER_BINS} ${PARTITION_BIN}
print_status "All tests completed"
if [ -n "${FAILURES}" ]; then
echo "Some failures were detected:"