Skip to content

Commit e04fddc

Browse files
committed
CMake: Fix failure due to MbedTLS rdir relocation
1 parent aeaff5f commit e04fddc

File tree

24 files changed

+101
-107
lines changed

24 files changed

+101
-107
lines changed

connectivity/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ add_subdirectory(cellular)
77
add_subdirectory(drivers)
88
add_subdirectory(libraries)
99
add_subdirectory(lwipstack)
10+
add_subdirectory(mbedtls)
1011
add_subdirectory(nanostack)
1112
add_subdirectory(netsocket)

connectivity/drivers/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ add_subdirectory(802.15.4_RF)
55
add_subdirectory(ble)
66
add_subdirectory(cellular)
77
add_subdirectory(emac)
8+
add_subdirectory(mbedtls)
89
add_subdirectory(wifi)

features/mbedtls/targets/CMakeLists.txt renamed to connectivity/drivers/mbedtls/TARGET_NUVOTON/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,3 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
mbed_add_cmake_directory_if_labels("TARGET")
5-
6-
7-
target_sources(mbed-os
8-
PRIVATE
9-
hash_wrappers.c
10-
)

connectivity/mbedtls/CMakeLists.txt

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
# Copyright (c) 2020 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
target_include_directories(mbed-os
5+
PUBLIC
6+
${CMAKE_CURRENT_SOURCE_DIR}
7+
${CMAKE_CURRENT_SOURCE_DIR}/include
8+
${CMAKE_CURRENT_SOURCE_DIR}/include/mbedtls
9+
${CMAKE_CURRENT_SOURCE_DIR}/platform
10+
${CMAKE_CURRENT_SOURCE_DIR}/platform/inc
11+
)
12+
13+
target_sources(mbed-os
14+
PRIVATE
15+
platform/src/mbed_trng.cpp
16+
platform/src/platform_alt.cpp
17+
platform/src/shared_rng.cpp
18+
19+
source/aes.c
20+
source/aesni.c
21+
source/arc4.c
22+
source/aria.c
23+
source/asn1parse.c
24+
source/asn1write.c
25+
source/base64.c
26+
source/bignum.c
27+
source/blowfish.c
28+
source/camellia.c
29+
source/ccm.c
30+
source/certs.c
31+
source/chacha20.c
32+
source/chachapoly.c
33+
source/cipher.c
34+
source/cipher_wrap.c
35+
source/cmac.c
36+
source/ctr_drbg.c
37+
source/debug.c
38+
source/des.c
39+
source/dhm.c
40+
source/ecdh.c
41+
source/ecdsa.c
42+
source/ecjpake.c
43+
source/ecp.c
44+
source/ecp_curves.c
45+
source/entropy.c
46+
source/entropy_poll.c
47+
source/error.c
48+
source/gcm.c
49+
source/hash_wrappers.c
50+
source/havege.c
51+
source/hkdf.c
52+
source/hmac_drbg.c
53+
source/md.c
54+
source/md2.c
55+
source/md4.c
56+
source/md5.c
57+
source/memory_buffer_alloc.c
58+
source/net_sockets.c
59+
source/nist_kw.c
60+
source/oid.c
61+
source/padlock.c
62+
source/pem.c
63+
source/pk.c
64+
source/pk_wrap.c
65+
source/pkcs11.c
66+
source/pkcs12.c
67+
source/pkcs5.c
68+
source/pkparse.c
69+
source/pkwrite.c
70+
source/platform.c
71+
source/platform_util.c
72+
source/poly1305.c
73+
source/ripemd160.c
74+
source/rsa.c
75+
source/rsa_internal.c
76+
source/sha1.c
77+
source/sha256.c
78+
source/sha512.c
79+
source/ssl_cache.c
80+
source/ssl_ciphersuites.c
81+
source/ssl_cli.c
82+
source/ssl_cookie.c
83+
source/ssl_msg.c
84+
source/ssl_srv.c
85+
source/ssl_ticket.c
86+
source/ssl_tls.c
87+
source/threading.c
88+
source/timing.c
89+
source/version.c
90+
source/version_features.c
91+
source/x509.c
92+
source/x509_create.c
93+
source/x509_crl.c
94+
source/x509_crt.c
95+
source/x509_csr.c
96+
source/x509write_crt.c
97+
source/x509write_csr.c
98+
source/xtea.c
99+
)

features/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ add_subdirectory(frameworks/mbed-client-randlib)
99
add_subdirectory(frameworks/mbed-trace)
1010
add_subdirectory(frameworks/mbed-client-cli)
1111
add_subdirectory(lorawan)
12-
add_subdirectory(mbedtls)
1312
add_subdirectory(nfc)
1413

1514
target_include_directories(mbed-os

features/mbedtls/CMakeLists.txt

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

0 commit comments

Comments
 (0)