commit aef8cf3b2e1056f67124a47961d76087f5a28f64
author Ronald Cron <ronald.cron@arm.com> Mon Jul 01 18:33:24 2024 +0200
committer Ronald Cron <ronald.cron@arm.com> Wed Jul 10 08:10:40 2024 +0200
tree 3498e20a21d7e4c7b27428f8bbcf6abbfd1a9aaf
parent 1606cff72cc9f4ac90a2fe5fd2e59302fc333924

Adjust build systems

Adjust build systems such as we can built
Mbed TLS in the default and full configuration.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index edf7790..e1bfbb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -294,12 +294,10 @@
 
 add_subdirectory(include)
 
-add_subdirectory(3rdparty)
+add_subdirectory(tf-psa-crypto)
 
 add_subdirectory(library)
 
-add_subdirectory(tf-psa-crypto)
-
 add_subdirectory(pkgconfig)
 
 #
@@ -374,7 +372,7 @@
         PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/library
         PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/core
         PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/drivers/builtin/src
-        PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/everest/include)
+        PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/drivers/everest/include)
 
     # Pass-through MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE
     if(MBEDTLS_CONFIG_FILE)