From f584e97aed1bba3f019f90fda6d9c55cd7381735 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Mon, 7 Oct 2024 11:38:17 +0200 Subject: [PATCH] cmake: Use MBEDTLS/TF_PSA_CRYTPO_AS_SUBPROJECT Use MBEDTLS/TF_PSA_CRYTPO_AS_SUBPROJECT instead of using the test employed to set MBEDTLS/TF_PSA_CRYTPO_AS_SUBPROJECT value. Signed-off-by: Ronald Cron --- CMakeLists.txt | 2 +- tf-psa-crypto/TF-PSA-Crypto.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 561498c5d4..7f31c61758 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,7 +150,7 @@ set(THREADS_PREFER_PTHREAD_FLAG TRUE) find_package(Threads) # If this is the root project add longer list of available CMAKE_BUILD_TYPE values -if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) +if(NOT MBEDTLS_AS_SUBPROJECT) set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "Choose the type of build: None Debug Release Coverage ASan ASanDbg MemSan MemSanDbg Check CheckFull TSan TSanDbg" FORCE) diff --git a/tf-psa-crypto/TF-PSA-Crypto.cmake b/tf-psa-crypto/TF-PSA-Crypto.cmake index e520ad15be..1ccb87cf6a 100644 --- a/tf-psa-crypto/TF-PSA-Crypto.cmake +++ b/tf-psa-crypto/TF-PSA-Crypto.cmake @@ -101,7 +101,7 @@ set(THREADS_PREFER_PTHREAD_FLAG TRUE) find_package(Threads) # If this is the root project add longer list of available CMAKE_BUILD_TYPE values -if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) +if(NOT TF_PSA_CRYPTO_AS_SUBPROJECT) set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "Choose the type of build: None Debug Release Coverage ASan ASanDbg MemSan MemSanDbg Check CheckFull TSan TSanDbg" FORCE)