only keep minimal changes to cmake

This commit is contained in:
Ashish Sharma
2025-12-11 18:25:15 +08:00
parent 74289c0619
commit 66753bb91f
2 changed files with 115 additions and 115 deletions
+72 -72
View File
@@ -68,7 +68,7 @@ endif()
set(MBEDTLS_DIR ${CMAKE_CURRENT_SOURCE_DIR})
# set(MBEDTLS_FRAMEWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/framework)
option(ENABLE_PROGRAMS "Build Mbed TLS programs." OFF)
option(ENABLE_PROGRAMS "Build Mbed TLS programs." ON)
option(MBEDTLS_FATAL_WARNINGS "Compiler warnings treated as errors" ON)
if(CMAKE_HOST_WIN32)
@@ -391,79 +391,79 @@ add_subdirectory(pkgconfig)
# target. This library of objects is used by tests and programs CMake files
# to define the test executables.
#
# if(ENABLE_TESTING OR ENABLE_PROGRAMS)
# file(GLOB MBEDTLS_TEST_FILES
# # ${MBEDTLS_FRAMEWORK_DIR}/tests/src/*.c
# # ${MBEDTLS_FRAMEWORK_DIR}/tests/src/drivers/*.c)
# add_library(mbedtls_test OBJECT ${MBEDTLS_TEST_FILES})
# set_base_compile_options(mbedtls_test)
# if(GEN_FILES)
# add_custom_command(
# OUTPUT
# ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_keys.h
# COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test
# COMMAND
# "${MBEDTLS_PYTHON_EXECUTABLE}"
# "${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_test_keys.py"
# "--output"
# "${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_keys.h"
# DEPENDS
# ${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_test_keys.py
# )
# add_custom_target(mbedtls_test_keys_header
# DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_keys.h)
# add_dependencies(mbedtls_test mbedtls_test_keys_header)
# endif()
# target_include_directories(mbedtls_test
# PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/tests/include
# PRIVATE ${MBEDTLS_FRAMEWORK_DIR}/tests/include
# PRIVATE tests/include
# PRIVATE include
# PRIVATE tf-psa-crypto/include
# PRIVATE tf-psa-crypto/drivers/builtin/include
# PRIVATE tf-psa-crypto/drivers/everest/include
# PRIVATE library
# PRIVATE tf-psa-crypto/core
# PRIVATE tf-psa-crypto/drivers/builtin/src)
# # Request C11, needed for memory poisoning tests
# set_target_properties(mbedtls_test PROPERTIES C_STANDARD 11)
# set_config_files_compile_definitions(mbedtls_test)
if(ENABLE_TESTING OR ENABLE_PROGRAMS)
file(GLOB MBEDTLS_TEST_FILES
${MBEDTLS_FRAMEWORK_DIR}/tests/src/*.c
${MBEDTLS_FRAMEWORK_DIR}/tests/src/drivers/*.c)
add_library(mbedtls_test OBJECT ${MBEDTLS_TEST_FILES})
set_base_compile_options(mbedtls_test)
if(GEN_FILES)
add_custom_command(
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_keys.h
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test
COMMAND
"${MBEDTLS_PYTHON_EXECUTABLE}"
"${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_test_keys.py"
"--output"
"${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_keys.h"
DEPENDS
${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_test_keys.py
)
add_custom_target(mbedtls_test_keys_header
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_keys.h)
add_dependencies(mbedtls_test mbedtls_test_keys_header)
endif()
target_include_directories(mbedtls_test
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/tests/include
PRIVATE ${MBEDTLS_FRAMEWORK_DIR}/tests/include
PRIVATE tests/include
PRIVATE include
PRIVATE tf-psa-crypto/include
PRIVATE tf-psa-crypto/drivers/builtin/include
PRIVATE tf-psa-crypto/drivers/everest/include
PRIVATE library
PRIVATE tf-psa-crypto/core
PRIVATE tf-psa-crypto/drivers/builtin/src)
# Request C11, needed for memory poisoning tests
set_target_properties(mbedtls_test PROPERTIES C_STANDARD 11)
set_config_files_compile_definitions(mbedtls_test)
# file(GLOB MBEDTLS_TEST_HELPER_FILES
# tests/src/*.c tests/src/test_helpers/*.c)
# add_library(mbedtls_test_helpers OBJECT ${MBEDTLS_TEST_HELPER_FILES})
# set_base_compile_options(mbedtls_test_helpers)
# if(GEN_FILES)
# add_custom_command(
# OUTPUT
# ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_certs.h
# COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test
# COMMAND
# "${MBEDTLS_PYTHON_EXECUTABLE}"
# "${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_test_cert_macros.py"
# "--output"
# "${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_certs.h"
# DEPENDS
# ${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_test_cert_macros.py
# )
# add_custom_target(mbedtls_test_certs_header
# DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_certs.h)
# add_dependencies(mbedtls_test_helpers mbedtls_test_certs_header)
# endif()
# target_include_directories(mbedtls_test_helpers
# PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/tests/include
# PRIVATE ${MBEDTLS_FRAMEWORK_DIR}/tests/include
# PRIVATE tests/include
# PRIVATE include
# PRIVATE tf-psa-crypto/include
# PRIVATE tf-psa-crypto/drivers/builtin/include
# PRIVATE library
# PRIVATE tf-psa-crypto/core
# PRIVATE tf-psa-crypto/drivers/builtin/src
# PRIVATE tf-psa-crypto/drivers/everest/include)
file(GLOB MBEDTLS_TEST_HELPER_FILES
tests/src/*.c tests/src/test_helpers/*.c)
add_library(mbedtls_test_helpers OBJECT ${MBEDTLS_TEST_HELPER_FILES})
set_base_compile_options(mbedtls_test_helpers)
if(GEN_FILES)
add_custom_command(
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_certs.h
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test
COMMAND
"${MBEDTLS_PYTHON_EXECUTABLE}"
"${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_test_cert_macros.py"
"--output"
"${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_certs.h"
DEPENDS
${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_test_cert_macros.py
)
add_custom_target(mbedtls_test_certs_header
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_certs.h)
add_dependencies(mbedtls_test_helpers mbedtls_test_certs_header)
endif()
target_include_directories(mbedtls_test_helpers
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/tests/include
PRIVATE ${MBEDTLS_FRAMEWORK_DIR}/tests/include
PRIVATE tests/include
PRIVATE include
PRIVATE tf-psa-crypto/include
PRIVATE tf-psa-crypto/drivers/builtin/include
PRIVATE library
PRIVATE tf-psa-crypto/core
PRIVATE tf-psa-crypto/drivers/builtin/src
PRIVATE tf-psa-crypto/drivers/everest/include)
# set_config_files_compile_definitions(mbedtls_test_helpers)
# endif()
set_config_files_compile_definitions(mbedtls_test_helpers)
endif()
if(ENABLE_PROGRAMS)
set(ssl_opt_target "${MBEDTLS_TARGET_PREFIX}ssl-opt")
+43 -43
View File
@@ -80,7 +80,7 @@ ADD_CUSTOM_TARGET(${TF_PSA_CRYPTO_TARGET_PREFIX}tfpsacrypto-apidoc
COMMAND doxygen tfpsacrypto.doxyfile
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doxygen)
option(ENABLE_PROGRAMS "Build TF-PSA-Crypto programs." OFF)
option(ENABLE_PROGRAMS "Build TF-PSA-Crypto programs." ON)
option(TF_PSA_CRYPTO_FATAL_WARNINGS "Compiler warnings treated as errors" ON)
if(CMAKE_HOST_WIN32)
@@ -369,50 +369,50 @@ add_subdirectory(pkgconfig)
# objects target. This library of objects is used by tests and programs CMake
# files to define the test executables.
#
# if(ENABLE_TESTING OR ENABLE_PROGRAMS)
# file(GLOB TF_PSA_CRYPTO_TEST_FILES
# ${TF_PSA_CRYPTO_FRAMEWORK_DIR}/tests/src/*.c
# ${TF_PSA_CRYPTO_FRAMEWORK_DIR}/tests/src/drivers/*.c
# tests/src/*.c)
# add_library(tf_psa_crypto_test OBJECT ${TF_PSA_CRYPTO_TEST_FILES})
# tf_psa_crypto_set_base_compile_options(tf_psa_crypto_test)
# if(GEN_FILES)
# add_custom_command(
# OUTPUT
# ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_keys.h
# COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test
# COMMAND
# "${TF_PSA_CRYPTO_PYTHON_EXECUTABLE}"
# "${TF_PSA_CRYPTO_FRAMEWORK_DIR}/scripts/generate_test_keys.py"
# "--output"
# "${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_keys.h"
# DEPENDS
# ${TF_PSA_CRYPTO_FRAMEWORK_DIR}/scripts/generate_test_keys.py
# )
# add_custom_target(tf_psa_crypto_test_keys_header
# DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_keys.h)
# add_dependencies(tf_psa_crypto_test tf_psa_crypto_test_keys_header)
# endif()
if(ENABLE_TESTING OR ENABLE_PROGRAMS)
file(GLOB TF_PSA_CRYPTO_TEST_FILES
${TF_PSA_CRYPTO_FRAMEWORK_DIR}/tests/src/*.c
${TF_PSA_CRYPTO_FRAMEWORK_DIR}/tests/src/drivers/*.c
tests/src/*.c)
add_library(tf_psa_crypto_test OBJECT ${TF_PSA_CRYPTO_TEST_FILES})
tf_psa_crypto_set_base_compile_options(tf_psa_crypto_test)
if(GEN_FILES)
add_custom_command(
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_keys.h
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test
COMMAND
"${TF_PSA_CRYPTO_PYTHON_EXECUTABLE}"
"${TF_PSA_CRYPTO_FRAMEWORK_DIR}/scripts/generate_test_keys.py"
"--output"
"${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_keys.h"
DEPENDS
${TF_PSA_CRYPTO_FRAMEWORK_DIR}/scripts/generate_test_keys.py
)
add_custom_target(tf_psa_crypto_test_keys_header
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_keys.h)
add_dependencies(tf_psa_crypto_test tf_psa_crypto_test_keys_header)
endif()
# file(WRITE
# ${CMAKE_CURRENT_BINARY_DIR}/tests/seedfile
# "This is a seedfile that contains 64 bytes ......................"
# )
file(WRITE
${CMAKE_CURRENT_BINARY_DIR}/tests/seedfile
"This is a seedfile that contains 64 bytes ......................"
)
# target_include_directories(tf_psa_crypto_test
# PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/tests/include
# PRIVATE ${TF_PSA_CRYPTO_FRAMEWORK_DIR}/tests/include
# PRIVATE tests/include
# PRIVATE tests/include/test
# PRIVATE include
# PRIVATE drivers/builtin/include
# PRIVATE drivers/everest/include
# PRIVATE core
# PRIVATE drivers/builtin/src)
# # Request C11, needed for memory poisoning tests
# set_target_properties(tf_psa_crypto_test PROPERTIES C_STANDARD 11)
# tf_psa_crypto_set_config_files_compile_definitions(tf_psa_crypto_test)
# endif()
target_include_directories(tf_psa_crypto_test
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/tests/include
PRIVATE ${TF_PSA_CRYPTO_FRAMEWORK_DIR}/tests/include
PRIVATE tests/include
PRIVATE tests/include/test
PRIVATE include
PRIVATE drivers/builtin/include
PRIVATE drivers/everest/include
PRIVATE core
PRIVATE drivers/builtin/src)
# Request C11, needed for memory poisoning tests
set_target_properties(tf_psa_crypto_test PROPERTIES C_STANDARD 11)
tf_psa_crypto_set_config_files_compile_definitions(tf_psa_crypto_test)
endif()
if(ENABLE_PROGRAMS)
add_subdirectory(programs)