ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-06-26 07:05:15 +08:00
Code Issues Releases Wiki Activity

CMakeLists: prepare for Everest headers relocation

Browse Source 
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2025-06-16 15:16:16 +02:00
parent 3de417fce2
commit 653a86dc2a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -434,6 +434,14 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS)
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_keys.h) DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_keys.h)
add_dependencies(mbedtls_test mbedtls_test_keys_header) add_dependencies(mbedtls_test mbedtls_test_keys_header)
endif() 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 target_include_directories(mbedtls_test
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/tests/include PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/tests/include
PRIVATE ${MBEDTLS_FRAMEWORK_DIR}/tests/include PRIVATE ${MBEDTLS_FRAMEWORK_DIR}/tests/include
@ -441,7 +449,7 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS)
PRIVATE include PRIVATE include
PRIVATE tf-psa-crypto/include PRIVATE tf-psa-crypto/include
PRIVATE tf-psa-crypto/drivers/builtin/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 library
PRIVATE tf-psa-crypto/core PRIVATE tf-psa-crypto/core
PRIVATE tf-psa-crypto/drivers/builtin/src) PRIVATE tf-psa-crypto/drivers/builtin/src)
@ -480,7 +488,7 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS)
PRIVATE library PRIVATE library
PRIVATE tf-psa-crypto/core PRIVATE tf-psa-crypto/core
PRIVATE tf-psa-crypto/drivers/builtin/src 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) set_config_files_compile_definitions(mbedtls_test_helpers)
endif() endif()