Skip to content

Commit 30e519a

Browse files
committed
Use -Wno-unterminated-string-initialization to fix mbedtls compilation
Signed-off-by: Paul Guyot <pguyot@kallisys.net>
1 parent 8d4f451 commit 30e519a

File tree

2 files changed

+29
-17
lines changed

2 files changed

+29
-17
lines changed

CMakeModules/FetchMbedTLS.cmake

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,37 @@ include(FetchContent)
2222

2323
FetchContent_Declare(
2424
mbedtls
25-
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/mbedtls.patch"
2625
GIT_REPOSITORY http://github.com/mbed-TLS/mbedtls.git
2726
GIT_TAG v3.6.3.1
2827
GIT_SHALLOW 1
2928
)
3029

31-
FetchContent_MakeAvailable(mbedtls)
30+
include(CheckCompilerFlag)
31+
check_compiler_flag(C -Wno-unterminated-string-initialization compiler_supports_unterminated_string_initialization)
32+
33+
if (${compiler_supports_unterminated_string_initialization})
34+
get_property(
35+
compile_options
36+
DIRECTORY
37+
PROPERTY COMPILE_OPTIONS
38+
)
39+
40+
set_property(
41+
DIRECTORY
42+
APPEND
43+
PROPERTY COMPILE_OPTIONS -Wno-unterminated-string-initialization
44+
)
45+
46+
FetchContent_MakeAvailable(mbedtls)
47+
48+
set_property(
49+
DIRECTORY
50+
PROPERTY COMPILE_OPTIONS ${compile_options}
51+
)
52+
53+
unset(compile_options)
54+
else()
55+
FetchContent_MakeAvailable(mbedtls)
56+
endif ()
57+
58+
unset(compiler_supports_unterminated_string_initialization)

CMakeModules/mbedtls.patch

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)