diff --git a/cmake/emil_test_helpers.cmake b/cmake/emil_test_helpers.cmake index 0c20b7e29..3336f6ee7 100644 --- a/cmake/emil_test_helpers.cmake +++ b/cmake/emil_test_helpers.cmake @@ -6,7 +6,7 @@ function(emil_fetch_googletest) FetchContent_Declare( googletest GIT_REPOSITORY https://github.com/google/googletest - GIT_TAG b796f7d44681514f58a683a3a71ff17c94edb0c1 # v1.13.0 + GIT_TAG release-1.12.1 ) set(gtest_force_shared_crt On CACHE BOOL "" FORCE) # For Windows: Prevent overriding the parent project's compiler/linker settings diff --git a/external/crypto/mbedtls/CMakeLists.txt b/external/crypto/mbedtls/CMakeLists.txt index 457e438da..b5514e418 100644 --- a/external/crypto/mbedtls/CMakeLists.txt +++ b/external/crypto/mbedtls/CMakeLists.txt @@ -1,7 +1,7 @@ FetchContent_Declare( mbedtls GIT_REPOSITORY https://github.com/Mbed-TLS/mbedtls - GIT_TAG 72718dd87e087215ce9155a826ee5a66cfbe9631 # v3.4.1 + GIT_TAG 869298bffeea13b205343361b7a7daf2b210e33d # v3.2.1 ) set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL On) @@ -17,6 +17,10 @@ function(add_mbedtls_target_properties) foreach(target ${ARGN}) target_compile_options(${target} PUBLIC -DMBEDTLS_CONFIG_FILE="mbedtls/mbedtls_emil_config.h" + # see https://github.com/Mbed-TLS/mbedtls/pull/6966 + # mbedtls sets the -Wdocumentation flag, which is throwing warnings + # since clang-15 + $<$:-Wno-documentation> ) target_include_directories(${target} PUBLIC