Skip to content

Commit f351c6c

Browse files
committed
Initialize PICO_MBEDTLS_PATH in same way as SDK
Priority to CMake var, then env var, then default to SDK submodule
1 parent dced576 commit f351c6c

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

lib/CMakeLists.txt

+12-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,20 @@ add_subdirectory(nlohmann_json EXCLUDE_FROM_ALL)
2020

2121
add_subdirectory(whereami EXCLUDE_FROM_ALL)
2222

23-
if(EXISTS "${PICO_SDK_PATH}/lib/mbedtls/CMakeLists.txt")
23+
# Taken from pico-sdk/src/rp2_common/pico_mbedtls/CMakeLists.txt
24+
if (DEFINED ENV{PICO_MBEDTLS_PATH} AND (NOT PICO_MBEDTLS_PATH))
25+
set(PICO_MBEDTLS_PATH $ENV{PICO_MBEDTLS_PATH})
26+
message("Using PICO_MBEDTLS_PATH from environment ('${PICO_MBEDTLS_PATH}')")
27+
endif()
28+
29+
set(MBEDTLS_TEST_PATH "library/aes.c")
30+
if (NOT PICO_MBEDTLS_PATH)
2431
set(PICO_MBEDTLS_PATH ${PICO_SDK_PATH}/lib/mbedtls)
32+
elseif (NOT EXISTS "${PICO_MBEDTLS_PATH}/${MBEDTLS_TEST_PATH}")
33+
message(WARNING "PICO_MBEDTLS_PATH specified but content not present.")
34+
endif()
2535

26-
# Taken from pico-sdk/src/rp2_common/pico_mbedtls/CMakeLists.txt
36+
if(EXISTS "${PICO_MBEDTLS_PATH}/${MBEDTLS_TEST_PATH}")
2737
# Support version 2.28.8 or 3.6.2
2838
if (EXISTS ${PICO_MBEDTLS_PATH}/library/ssl_cli.c)
2939
set(MBEDTLS_VERSION_MAJOR 2)

0 commit comments

Comments
 (0)