From bcaa74bae65ec6915cd4044c8c0bd1d4bb4a1b32 Mon Sep 17 00:00:00 2001 From: Ashish Sharma Date: Thu, 2 Apr 2026 15:14:57 +0800 Subject: [PATCH] feat(mbedtls): minimal CMake changes for build setup --- CMakeLists.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a19b6f723b..c42baed004 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,7 @@ endif() # Set the project and framework root directory. set(MBEDTLS_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -set(MBEDTLS_FRAMEWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/framework) +# set(MBEDTLS_FRAMEWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/framework) option(ENABLE_PROGRAMS "Build Mbed TLS programs." ON) @@ -186,7 +186,7 @@ endfunction(get_name_without_last_ext) include(CheckCCompilerFlag) set(CMAKE_C_EXTENSIONS OFF) -set(CMAKE_C_STANDARD 99) +# set(CMAKE_C_STANDARD 99) function(set_base_compile_options target) if(CMAKE_COMPILER_IS_GNU) @@ -334,14 +334,14 @@ if(CMAKE_BUILD_TYPE STREQUAL "Check" AND TEST_CPP) endif() endif() -if (NOT EXISTS "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt") - if (EXISTS "${MBEDTLS_DIR}/.git") - message(FATAL_ERROR "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt not found (and does appear to be a git checkout). Run `git submodule update --init` from the source tree to fetch the submodule contents.") - else () - message(FATAL_ERROR "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt not found (and does not appear to be a git checkout). Please ensure you have downloaded the right archive from the release page on GitHub.") - endif() -endif() -add_subdirectory(framework) +# if (NOT EXISTS "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt") +# if (EXISTS "${MBEDTLS_DIR}/.git") +# message(FATAL_ERROR "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt not found (and does appear to be a git checkout). Run `git submodule update --init` from the source tree to fetch the submodule contents.") +# else () +# message(FATAL_ERROR "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt not found (and does not appear to be a git checkout). Please ensure you have downloaded the right archive from the release page on GitHub.") +# endif() +# endif() +# add_subdirectory(framework) add_subdirectory(include)