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

Update paths for moved program files in CMakeLists

Browse Source 
This commit fixes the paths of program files which were moved to the
MbedTLS Framework.

Signed-off-by: Harry Ramsey <harry.ramsey@arm.com>
This commit is contained in:
Harry Ramsey 2025-02-12 10:18:51 +00:00
parent c19b8e80e7
commit 53ba6ad106
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
programs/ssl/CMakeLists.txt
View File

@ -35,7 +35,7 @@ foreach(exe IN LISTS executables)
if(exe STREQUAL "ssl_client2" OR exe STREQUAL "ssl_server2") if(exe STREQUAL "ssl_client2" OR exe STREQUAL "ssl_server2")
list(APPEND extra_sources list(APPEND extra_sources
ssl_test_lib.c ssl_test_lib.c
${CMAKE_CURRENT_SOURCE_DIR}/../test/query_config.h ${MBEDTLS_FRAMEWORK_DIR}/tests/programs/query_config.h
${CMAKE_CURRENT_BINARY_DIR}/../test/query_config.c) ${CMAKE_CURRENT_BINARY_DIR}/../test/query_config.c)
endif() endif()
add_executable(${exe} add_executable(${exe}
@ -45,14 +45,13 @@ foreach(exe IN LISTS executables)
${extra_sources}) ${extra_sources})
set_base_compile_options(${exe}) set_base_compile_options(${exe})
target_link_libraries(${exe} ${libs} ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(${exe} ${libs} ${CMAKE_THREAD_LIBS_INIT})
target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../framework/tests/include target_include_directories(${exe} PRIVATE ${MBEDTLS_FRAMEWORK_DIR}/tests/programs
${MBEDTLS_FRAMEWORK_DIR}/tests/include
${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include) ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include)
if(exe STREQUAL "ssl_client2" OR exe STREQUAL "ssl_server2") if(exe STREQUAL "ssl_client2" OR exe STREQUAL "ssl_server2")
if(GEN_FILES) if(GEN_FILES)
add_dependencies(${exe} generate_query_config_c) add_dependencies(${exe} generate_query_config_c)
endif() endif()
target_include_directories(${exe}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../test)
endif() endif()
endforeach() endforeach()
@ -62,7 +61,8 @@ if(THREADS_FOUND)
$<TARGET_OBJECTS:mbedtls_test> $<TARGET_OBJECTS:mbedtls_test>
$<TARGET_OBJECTS:mbedtls_test_helpers>) $<TARGET_OBJECTS:mbedtls_test_helpers>)
set_base_compile_options(ssl_pthread_server) set_base_compile_options(ssl_pthread_server)
target_include_directories(ssl_pthread_server PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../framework/tests/include target_include_directories(ssl_pthread_server PRIVATE ${MBEDTLS_FRAMEWORK_DIR}/tests/programs
${MBEDTLS_FRAMEWORK_DIR}/tests/include
${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include) ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include)
target_link_libraries(ssl_pthread_server ${libs} ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(ssl_pthread_server ${libs} ${CMAKE_THREAD_LIBS_INIT})
list(APPEND executables ssl_pthread_server) list(APPEND executables ssl_pthread_server)

13
programs/test/CMakeLists.txt
View File

@ -76,17 +76,24 @@ else()
endif() endif()
foreach(exe IN LISTS executables_libs executables_mbedcrypto) foreach(exe IN LISTS executables_libs executables_mbedcrypto)
set(source ${exe}.c)
set(extra_sources "") set(extra_sources "")
if(NOT EXISTS ${source} AND
EXISTS ${MBEDTLS_FRAMEWORK_DIR}/tests/programs/${source})
set(source ${MBEDTLS_FRAMEWORK_DIR}/tests/programs/${source})
endif()
if(exe STREQUAL "query_compile_time_config") if(exe STREQUAL "query_compile_time_config")
list(APPEND extra_sources list(APPEND extra_sources
${CMAKE_CURRENT_SOURCE_DIR}/query_config.h ${MBEDTLS_FRAMEWORK_DIR}/tests/programs/query_config.h
${CMAKE_CURRENT_BINARY_DIR}/query_config.c) ${CMAKE_CURRENT_BINARY_DIR}/query_config.c)
endif() endif()
add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test> add_executable(${exe} ${source} $<TARGET_OBJECTS:mbedtls_test>
${extra_sources}) ${extra_sources})
set_base_compile_options(${exe}) set_base_compile_options(${exe})
target_include_directories(${exe} target_include_directories(${exe}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../framework/tests/include) PRIVATE ${MBEDTLS_FRAMEWORK_DIR}/tests/include
${MBEDTLS_FRAMEWORK_DIR}/tests/programs)
target_include_directories(${exe} target_include_directories(${exe}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../library PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../library
${CMAKE_CURRENT_SOURCE_DIR}/../../tf-psa-crypto/core) ${CMAKE_CURRENT_SOURCE_DIR}/../../tf-psa-crypto/core)