Skip to content

Commit

Permalink
chore: fix compilation with clang-15
Browse files Browse the repository at this point in the history
  • Loading branch information
rjaegers committed Sep 28, 2023
1 parent 6bd05b6 commit 9b0dba1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cmake/emil_test_helpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion external/crypto/mbedtls/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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
$<$<CXX_COMPILER_ID:Clang>:-Wno-documentation>
)

target_include_directories(${target} PUBLIC
Expand Down

0 comments on commit 9b0dba1

Please sign in to comment.