File tree 3 files changed +13
-5
lines changed
3 files changed +13
-5
lines changed Original file line number Diff line number Diff line change @@ -123,10 +123,10 @@ jobs:
123
123
export CXX="clang++"
124
124
fi
125
125
echo "Using CC: $CC and CXX: $CXX"
126
-
126
+
127
127
mkdir -p build
128
128
cd build
129
-
129
+
130
130
if [[ "${{ matrix.compiler }}" == "gcc" ]]; then
131
131
# Skip building the tests for Mac with GCC
132
132
# https://github.com/awslabs/aws-crt-cpp/issues/605
@@ -246,7 +246,7 @@ jobs:
246
246
run : |
247
247
mkdir build
248
248
cd build
249
- cmake .. -DBUILD_TEST=ON -DENABLE_AWS_SDK_IN_TESTS=OFF -DUSE_OPENSSL=OFF -DUSE_MBEDTLS=ON
249
+ cmake .. -DBUILD_TEST=ON -DENABLE_AWS_SDK_IN_TESTS=OFF -DUSE_OPENSSL=OFF -DUSE_MBEDTLS=ON -DBUILD_OLD_MBEDTLS_VERSION=ON
250
250
make -j
251
251
252
252
- name : Configure AWS Credentials
Original file line number Diff line number Diff line change @@ -4,6 +4,12 @@ project(libmbedtls-download NONE)
4
4
5
5
include(ExternalProject)
6
6
7
+ if (BUILD_OLD_MBEDTLS_VERSION)
8
+ SET(MBEDTLS_GIT_TAG "v2.28.8")
9
+ else()
10
+ SET(MBEDTLS_GIT_TAG "v3.6.3")
11
+ endif()
12
+
7
13
if (BUILD_STATIC_LIBS)
8
14
set(BUILD_SHARED 0)
9
15
else()
@@ -21,7 +27,7 @@ message(STATUS "C flags here are ${CMAKE_C_FLAGS}")
21
27
ExternalProject_Add(
22
28
project_libmbedtls
23
29
GIT_REPOSITORY https://github.com/ARMmbed/mbedtls.git
24
- GIT_TAG v3.6.3
30
+ GIT_TAG ${MBEDTLS_GIT_TAG}
25
31
GIT_PROGRESS TRUE
26
32
GIT_SHALLOW TRUE
27
33
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/build
Original file line number Diff line number Diff line change @@ -22,6 +22,7 @@ option(ENABLE_KVS_THREADPOOL "Enable support for KVS thread pool in signaling" O
22
22
option (INSTRUMENTED_ALLOCATORS "Enable memory instrumentation" OFF )
23
23
option (ENABLE_AWS_SDK_IN_TESTS "Enable support for compiling AWS SDKs for tests" ON )
24
24
option (ENABLE_STATS_CALCULATION_CONTROL "Enable support for runtime control of ice agent stat calculations." OFF )
25
+ option (BUILD_OLD_MBEDTLS_VERSION "Use MbedTLS version 2.28.8." OFF )
25
26
26
27
# Developer Flags
27
28
option (BUILD_TEST "Build the testing tree." OFF )
@@ -182,6 +183,7 @@ if(BUILD_DEPENDENCIES)
182
183
elseif (USE_MBEDTLS)
183
184
set (BUILD_ARGS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
184
185
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
186
+ -DBUILD_OLD_MBEDTLS_VERSION=${BUILD_OLD_MBEDTLS_VERSION}
185
187
"-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -std=c99" )
186
188
build_dependency(mbedtls ${BUILD_ARGS} )
187
189
endif ()
@@ -446,7 +448,7 @@ target_link_libraries(
446
448
kvsWebrtcSignalingClient
447
449
PUBLIC
448
450
kvsCommonLws
449
- ${LIBWEBSOCKETS_LIBRARIES}
451
+ ${LIBWEBSOCKETS_LIBRARIES}
450
452
PRIVATE kvspicUtils
451
453
kvspicState
452
454
${CMAKE_THREAD_LIBS_INIT}
You can’t perform that action at this time.
0 commit comments