From a8883199d4c62be832fce0132fc4dfd2e2322fc9 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Fri, 12 Apr 2024 13:56:32 +0200 Subject: [PATCH] cmake: Compatibility with MbedTLS 3.6.0 Signed-off-by: Jakub Jelen Reviewed-by: Sahana Prasad --- cmake/Modules/FindMbedTLS.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmake/Modules/FindMbedTLS.cmake b/cmake/Modules/FindMbedTLS.cmake index ee52ad84..9f647028 100644 --- a/cmake/Modules/FindMbedTLS.cmake +++ b/cmake/Modules/FindMbedTLS.cmake @@ -34,7 +34,7 @@ set(_MBEDTLS_ROOT_HINTS_AND_PATHS find_path(MBEDTLS_INCLUDE_DIR NAMES - mbedtls/config.h + mbedtls/ssl.h HINTS ${_MBEDTLS_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES @@ -73,6 +73,14 @@ set(MBEDTLS_LIBRARIES ${MBEDTLS_SSL_LIBRARY} ${MBEDTLS_CRYPTO_LIBRARY} ${MBEDTLS_X509_LIBRARY}) if (MBEDTLS_INCLUDE_DIR AND EXISTS "${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h") + # mbedtls 2.8 + file(STRINGS "${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h" _mbedtls_version_str REGEX + "^#[\t ]*define[\t ]+MBEDTLS_VERSION_STRING[\t ]+\"[0-9]+.[0-9]+.[0-9]+\"") + + string(REGEX REPLACE "^.*MBEDTLS_VERSION_STRING.*([0-9]+.[0-9]+.[0-9]+).*" + "\\1" MBEDTLS_VERSION "${_mbedtls_version_str}") +elseif (MBEDTLS_INCLUDE_DIR AND EXISTS "${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h") + # mbedtls 3.6 file(STRINGS "${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h" _mbedtls_version_str REGEX "^#[\t ]*define[\t ]+MBEDTLS_VERSION_STRING[\t ]+\"[0-9]+.[0-9]+.[0-9]+\"") @@ -93,7 +101,7 @@ if (MBEDTLS_VERSION) in the system variable MBEDTLS_ROOT_DIR" ) else (MBEDTLS_VERSION) - find_package_handle_standard_args(MBedTLS + find_package_handle_standard_args(MbedTLS "Could NOT find mbedTLS, try to set the path to mbedTLS root folder in the system variable MBEDTLS_ROOT_DIR" MBEDTLS_INCLUDE_DIR