From 653a86dc2a36d6fa6b37ada91d9ca01a7ee63ff8 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Mon, 16 Jun 2025 15:16:16 +0200 Subject: [PATCH] CMakeLists: prepare for Everest headers relocation Signed-off-by: Valerio Setti --- CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bda3977d07..84bed5aba3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -434,6 +434,14 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS) DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_keys.h) add_dependencies(mbedtls_test mbedtls_test_keys_header) endif() + # This is a dirty fix to allow mbedtls#10091 to be merged without psa#325. + # Once the latter will be merged, this can be simplified to just use + # the new path. + if(EXISTS "tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private") + set(EVEREST_HEADERS_PATH "tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private") + else() + set(EVEREST_HEADERS_PATH "tf-psa-crypto/drivers/everest/include") + endif() target_include_directories(mbedtls_test PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/tests/include PRIVATE ${MBEDTLS_FRAMEWORK_DIR}/tests/include @@ -441,7 +449,7 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS) PRIVATE include PRIVATE tf-psa-crypto/include PRIVATE tf-psa-crypto/drivers/builtin/include - PRIVATE tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/ + PRIVATE ${EVEREST_HEADERS_PATH} PRIVATE library PRIVATE tf-psa-crypto/core PRIVATE tf-psa-crypto/drivers/builtin/src) @@ -480,7 +488,7 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS) PRIVATE library PRIVATE tf-psa-crypto/core PRIVATE tf-psa-crypto/drivers/builtin/src - PRIVATE tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/) + PRIVATE ${EVEREST_HEADERS_PATH}) set_config_files_compile_definitions(mbedtls_test_helpers) endif()