CMake: Fix failure due to MbedTLS rdir relocation

connectivity/CMakeLists.txt

@@ -7,5 +7,6 @@ add_subdirectory(cellular)
 add_subdirectory(drivers)
 add_subdirectory(libraries)
 add_subdirectory(lwipstack)
+add_subdirectory(mbedtls)
 add_subdirectory(nanostack)
 add_subdirectory(netsocket)

connectivity/drivers/CMakeLists.txt

@@ -5,4 +5,5 @@ add_subdirectory(802.15.4_RF)
 add_subdirectory(ble)
 add_subdirectory(cellular)
 add_subdirectory(emac)
+add_subdirectory(mbedtls)
 add_subdirectory(wifi)

connectivity/drivers/mbedtls/TARGET_NUVOTON/CMakeLists.txt

@@ -2,9 +2,3 @@
 # SPDX-License-Identifier: Apache-2.0
 
 mbed_add_cmake_directory_if_labels("TARGET")
-
-
-target_sources(mbed-os
-    PRIVATE
-        hash_wrappers.c
-)

connectivity/mbedtls/CMakeLists.txt

@@ -0,0 +1,99 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_include_directories(mbed-os
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/mbedtls
+        ${CMAKE_CURRENT_SOURCE_DIR}/platform
+        ${CMAKE_CURRENT_SOURCE_DIR}/platform/inc
+)
+
+target_sources(mbed-os
+    PRIVATE
+        platform/src/mbed_trng.cpp
+        platform/src/platform_alt.cpp
+        platform/src/shared_rng.cpp
+
+        source/aes.c
+        source/aesni.c
+        source/arc4.c
+        source/aria.c
+        source/asn1parse.c
+        source/asn1write.c
+        source/base64.c
+        source/bignum.c
+        source/blowfish.c
+        source/camellia.c
+        source/ccm.c
+        source/certs.c
+        source/chacha20.c
+        source/chachapoly.c
+        source/cipher.c
+        source/cipher_wrap.c
+        source/cmac.c
+        source/ctr_drbg.c
+        source/debug.c
+        source/des.c
+        source/dhm.c
+        source/ecdh.c
+        source/ecdsa.c
+        source/ecjpake.c
+        source/ecp.c
+        source/ecp_curves.c
+        source/entropy.c
+        source/entropy_poll.c
+        source/error.c
+        source/gcm.c
+        source/hash_wrappers.c
+        source/havege.c
+        source/hkdf.c
+        source/hmac_drbg.c
+        source/md.c
+        source/md2.c
+        source/md4.c
+        source/md5.c
+        source/memory_buffer_alloc.c
+        source/net_sockets.c
+        source/nist_kw.c
+        source/oid.c
+        source/padlock.c
+        source/pem.c
+        source/pk.c
+        source/pk_wrap.c
+        source/pkcs11.c
+        source/pkcs12.c
+        source/pkcs5.c
+        source/pkparse.c
+        source/pkwrite.c
+        source/platform.c
+        source/platform_util.c
+        source/poly1305.c
+        source/ripemd160.c
+        source/rsa.c
+        source/rsa_internal.c
+        source/sha1.c
+        source/sha256.c
+        source/sha512.c
+        source/ssl_cache.c
+        source/ssl_ciphersuites.c
+        source/ssl_cli.c
+        source/ssl_cookie.c
+        source/ssl_msg.c
+        source/ssl_srv.c
+        source/ssl_ticket.c
+        source/ssl_tls.c
+        source/threading.c
+        source/timing.c
+        source/version.c
+        source/version_features.c
+        source/x509.c
+        source/x509_create.c
+        source/x509_crl.c
+        source/x509_crt.c
+        source/x509_csr.c
+        source/x509write_crt.c
+        source/x509write_csr.c
+        source/xtea.c
+)

features/CMakeLists.txt

@@ -9,7 +9,6 @@ add_subdirectory(frameworks/mbed-client-randlib)
 add_subdirectory(frameworks/mbed-trace)
 add_subdirectory(frameworks/mbed-client-cli)
 add_subdirectory(lorawan)
-add_subdirectory(mbedtls)
 add_subdirectory(nfc)
 
 target_include_directories(mbed-os

features/mbedtls/CMakeLists.txt

@@ -1,100 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(targets)
-
-target_sources(mbed-os
-    PRIVATE
-        platform/src/mbed_trng.cpp
-        platform/src/platform_alt.cpp
-        platform/src/shared_rng.cpp
-
-        src/aes.c
-        src/aesni.c
-        src/arc4.c
-        src/aria.c
-        src/asn1parse.c
-        src/asn1write.c
-        src/base64.c
-        src/bignum.c
-        src/blowfish.c
-        src/camellia.c
-        src/ccm.c
-        src/certs.c
-        src/chacha20.c
-        src/chachapoly.c
-        src/cipher.c
-        src/cipher_wrap.c
-        src/cmac.c
-        src/ctr_drbg.c
-        src/debug.c
-        src/des.c
-        src/dhm.c
-        src/ecdh.c
-        src/ecdsa.c
-        src/ecjpake.c
-        src/ecp.c
-        src/ecp_curves.c
-        src/entropy.c
-        src/entropy_poll.c
-        src/error.c
-        src/gcm.c
-        src/havege.c
-        src/hkdf.c
-        src/hmac_drbg.c
-        src/md.c
-        src/md2.c
-        src/md4.c
-        src/md5.c
-        src/memory_buffer_alloc.c
-        src/net_sockets.c
-        src/nist_kw.c
-        src/oid.c
-        src/padlock.c
-        src/pem.c
-        src/pk.c
-        src/pk_wrap.c
-        src/pkcs11.c
-        src/pkcs12.c
-        src/pkcs5.c
-        src/pkparse.c
-        src/pkwrite.c
-        src/platform.c
-        src/platform_util.c
-        src/poly1305.c
-        src/ripemd160.c
-        src/rsa.c
-        src/rsa_internal.c
-        src/sha1.c
-        src/sha256.c
-        src/sha512.c
-        src/ssl_cache.c
-        src/ssl_ciphersuites.c
-        src/ssl_cli.c
-        src/ssl_cookie.c
-        src/ssl_msg.c
-        src/ssl_srv.c
-        src/ssl_ticket.c
-        src/ssl_tls.c
-        src/threading.c
-        src/timing.c
-        src/version.c
-        src/version_features.c
-        src/x509.c
-        src/x509_create.c
-        src/x509_crl.c
-        src/x509_crt.c
-        src/x509_csr.c
-        src/x509write_crt.c
-        src/x509write_csr.c
-        src/xtea.c
-)
-
-target_include_directories(mbed-os
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/inc
-        ${CMAKE_CURRENT_SOURCE_DIR}/inc/mbedtls
-        ${CMAKE_CURRENT_SOURCE_DIR}/platform
-        ${CMAKE_CURRENT_SOURCE_DIR}/platform/inc
-)