mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-25 13:43:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update paths in TF-PSA-Crypto CMakeLists.txt

Browse Source 
Some test build commands were moved to the CMakeLists.txt in the
tf-psa-crypto directory. Apply framework-related changes to this moved
section.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
David Horstmann 2024-11-18 14:43:07 +00:00
parent 7bf3489d64
commit 0223bc6dcc
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tf-psa-crypto/CMakeLists.txt
View File

@ -401,25 +401,26 @@ add_subdirectory(pkgconfig)
# #
if(ENABLE_TESTING OR ENABLE_PROGRAMS) if(ENABLE_TESTING OR ENABLE_PROGRAMS)
file(GLOB MBEDTLS_TEST_FILES file(GLOB MBEDTLS_TEST_FILES
${MBEDTLS_DIR}/tests/src/*.c ${MBEDTLS_FRAMEWORK_DIR}/tests/src/*.c
${MBEDTLS_DIR}/tests/src/drivers/*.c) ${MBEDTLS_FRAMEWORK_DIR}/tests/src/drivers/*.c
${MBEDTLS_DIR}/tests/src/*.c)
add_library(tf_psa_crypto_test OBJECT ${MBEDTLS_TEST_FILES}) add_library(tf_psa_crypto_test OBJECT ${MBEDTLS_TEST_FILES})
set_base_compile_options(tf_psa_crypto_test) set_base_compile_options(tf_psa_crypto_test)
if(GEN_FILES) if(GEN_FILES)
add_custom_command( add_custom_command(
OUTPUT OUTPUT
${MBEDTLS_DIR}/tests/src/test_keys.h ${MBEDTLS_FRAMEWORK_DIR}/tests/src/test_keys.h
WORKING_DIRECTORY WORKING_DIRECTORY
${MBEDTLS_DIR}/tests ${MBEDTLS_DIR}/tests
COMMAND COMMAND
"${TF_PSA_CRYPTO_PYTHON_EXECUTABLE}" "${TF_PSA_CRYPTO_PYTHON_EXECUTABLE}"
"${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_test_keys.py" "${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_test_keys.py"
"--output" "--output"
"${MBEDTLS_DIR}/tests/src/test_keys.h" "${MBEDTLS_FRAMEWORK_DIR}/tests/src/test_keys.h"
DEPENDS DEPENDS
${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_test_keys.py ${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_test_keys.py
) )
add_custom_target(tf_psa_crypto_test_keys_header DEPENDS ${MBEDTLS_DIR}/tests/src/test_keys.h) add_custom_target(tf_psa_crypto_test_keys_header DEPENDS ${MBEDTLS_FRAMEWORK_DIR}/tests/src/test_keys.h)
add_custom_command( add_custom_command(
OUTPUT OUTPUT
@ -438,6 +439,7 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS)
add_dependencies(tf_psa_crypto_test tf_psa_crypto_test_keys_header tf_psa_crypto_test_certs_header) add_dependencies(tf_psa_crypto_test tf_psa_crypto_test_keys_header tf_psa_crypto_test_certs_header)
endif() endif()
target_include_directories(tf_psa_crypto_test target_include_directories(tf_psa_crypto_test
PRIVATE ${MBEDTLS_FRAMEWORK_DIR}/tests/include
PRIVATE ${MBEDTLS_DIR}/tests/include PRIVATE ${MBEDTLS_DIR}/tests/include
PRIVATE ${MBEDTLS_DIR}/include PRIVATE ${MBEDTLS_DIR}/include
PRIVATE include PRIVATE include