commit d3f717d5366902016e64628e7dde86719a79ee4b
author Ronald Cron <ronald.cron@arm.com> Thu Jul 25 14:58:47 2024 +0200
committer Ronald Cron <ronald.cron@arm.com> Tue Oct 01 15:32:01 2024 +0200
tree 9ff12e30fbe4098bf52e51ada5a92fba2d3c8662
parent 69c489c25abbee299d5c96fe4a41ce564f5a5a57

CMake: Move build of crypto test suites to tf-psa-crypto

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

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21c9925..d20dbfe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -430,7 +430,6 @@
     enable_testing()
 
     add_subdirectory(tests)
-    add_subdirectory(tf-psa-crypto/tests)
 
     # additional convenience targets for Unix only
     if(UNIX)

tf-psa-crypto/CMakeLists.txt

diff --git a/tf-psa-crypto/CMakeLists.txt b/tf-psa-crypto/CMakeLists.txt
index 1dc9f9f..3669da3 100644
--- a/tf-psa-crypto/CMakeLists.txt
+++ b/tf-psa-crypto/CMakeLists.txt
@@ -38,3 +38,8 @@
 add_subdirectory(include)
 add_subdirectory(core)
 add_subdirectory(drivers)
+
+if(ENABLE_TESTING)
+    enable_testing()
+    add_subdirectory(tests)
+endif()

tf-psa-crypto/tests/CMakeLists.txt

diff --git a/tf-psa-crypto/tests/CMakeLists.txt b/tf-psa-crypto/tests/CMakeLists.txt
index 88f12f8..cf25c71 100644
--- a/tf-psa-crypto/tests/CMakeLists.txt
+++ b/tf-psa-crypto/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(libs
-    ${mbedtls_target}
+    ${mbedcrypto_target}
     ${CMAKE_THREAD_LIBS_INIT}
 )