mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-30 07:20:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Link programs with pthread via cmake

Browse Source 
All programs are now linked directly with all test code, thus adding a
pthread abstraction into the test code means having to link the programs
with pthread (if the library is found under cmake).

Signed-off-by: Paul Elliott <paul.elliott@arm.com>
This commit is contained in:
Paul Elliott 2023-12-15 17:14:34 +00:00
parent 3dce2327ab
commit 4068c7e47c
13 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/aes/CMakeLists.txt
View File

@ -1,10 +1,12 @@
find_package(Threads)
set(executables set(executables
crypt_and_hash crypt_and_hash
) )
foreach(exe IN LISTS executables) foreach(exe IN LISTS executables)
add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>) add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>)
target_link_libraries(${exe} ${mbedcrypto_target}) target_link_libraries(${exe} ${mbedcrypto_target} ${CMAKE_THREAD_LIBS_INIT})
target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include) target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include)
endforeach() endforeach()

4
programs/cipher/CMakeLists.txt
View File

@ -1,10 +1,12 @@
find_package(Threads)
set(executables set(executables
cipher_aead_demo cipher_aead_demo
) )
foreach(exe IN LISTS executables) foreach(exe IN LISTS executables)
add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>) add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>)
target_link_libraries(${exe} ${mbedcrypto_target}) target_link_libraries(${exe} ${mbedcrypto_target} ${CMAKE_THREAD_LIBS_INIT})
target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include) target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include)
endforeach() endforeach()

3
programs/fuzz/CMakeLists.txt
View File

@ -1,5 +1,8 @@
find_package(Threads)
set(libs set(libs
${mbedtls_target} ${mbedtls_target}
${CMAKE_THREAD_LIBS_INIT}
) )
find_library(FUZZINGENGINE_LIB FuzzingEngine) find_library(FUZZINGENGINE_LIB FuzzingEngine)

4
programs/fuzz/Makefile
View File

@ -29,6 +29,10 @@ endif
ifdef WINDOWS_BUILD ifdef WINDOWS_BUILD
LOCAL_LDFLAGS += -lbcrypt LOCAL_LDFLAGS += -lbcrypt
else
ifeq ($(THREADING),pthread)
LOCAL_LDFLAGS += -lpthread
endif
endif endif
# A test application is built for each suites/test_suite_*.data file. # A test application is built for each suites/test_suite_*.data file.

4
programs/hash/CMakeLists.txt
View File

@ -1,3 +1,5 @@
find_package(Threads)
set(executables set(executables
generic_sum generic_sum
hello hello
@ -6,7 +8,7 @@ set(executables
foreach(exe IN LISTS executables) foreach(exe IN LISTS executables)
add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>) add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>)
target_link_libraries(${exe} ${mbedcrypto_target}) target_link_libraries(${exe} ${mbedcrypto_target} ${CMAKE_THREAD_LIBS_INIT})
target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include) target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include)
endforeach() endforeach()

6
programs/pkey/CMakeLists.txt
View File

@ -1,3 +1,5 @@
find_package(Threads)
set(executables_mbedtls set(executables_mbedtls
dh_client dh_client
dh_server dh_server
@ -5,7 +7,7 @@ set(executables_mbedtls
foreach(exe IN LISTS executables_mbedtls) foreach(exe IN LISTS executables_mbedtls)
add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>) add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>)
target_link_libraries(${exe} ${mbedtls_target}) target_link_libraries(${exe} ${mbedtls_target} ${CMAKE_THREAD_LIBS_INIT})
target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include) target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include)
endforeach() endforeach()
@ -32,7 +34,7 @@ set(executables_mbedcrypto
foreach(exe IN LISTS executables_mbedcrypto) foreach(exe IN LISTS executables_mbedcrypto)
add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>) add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>)
target_link_libraries(${exe} ${mbedcrypto_target}) target_link_libraries(${exe} ${mbedcrypto_target} ${CMAKE_THREAD_LIBS_INIT})
target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include) target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include)
endforeach() endforeach()

4
programs/psa/CMakeLists.txt
View File

@ -1,3 +1,5 @@
find_package(Threads)
set(executables set(executables
aead_demo aead_demo
crypto_examples crypto_examples
@ -28,7 +30,7 @@ endif()
foreach(exe IN LISTS executables) foreach(exe IN LISTS executables)
add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>) add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>)
target_link_libraries(${exe} ${mbedcrypto_target}) target_link_libraries(${exe} ${mbedcrypto_target} ${CMAKE_THREAD_LIBS_INIT})
target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include) target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include)
endforeach() endforeach()

4
programs/random/CMakeLists.txt
View File

@ -1,3 +1,5 @@
find_package(Threads)
set(executables set(executables
gen_entropy gen_entropy
gen_random_ctr_drbg gen_random_ctr_drbg
@ -5,7 +7,7 @@ set(executables
foreach(exe IN LISTS executables) foreach(exe IN LISTS executables)
add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>) add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>)
target_link_libraries(${exe} ${mbedcrypto_target}) target_link_libraries(${exe} ${mbedcrypto_target} ${CMAKE_THREAD_LIBS_INIT})
target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include) target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include)
endforeach() endforeach()

2
programs/ssl/CMakeLists.txt
View File

@ -39,7 +39,7 @@ foreach(exe IN LISTS executables)
endif() endif()
add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test> add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>
${extra_sources}) ${extra_sources})
target_link_libraries(${exe} ${libs}) target_link_libraries(${exe} ${libs} ${CMAKE_THREAD_LIBS_INIT})
target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include) target_include_directories(${exe} PRIVATE ${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)

8
programs/test/CMakeLists.txt
View File

@ -1,3 +1,5 @@
find_package(Threads)
set(libs set(libs
${mbedtls_target} ${mbedtls_target}
) )
@ -26,7 +28,7 @@ if(TEST_CPP)
) )
add_executable(cpp_dummy_build "${cpp_dummy_build_cpp}") add_executable(cpp_dummy_build "${cpp_dummy_build_cpp}")
target_include_directories(cpp_dummy_build PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../include) target_include_directories(cpp_dummy_build PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
target_link_libraries(cpp_dummy_build ${mbedcrypto_target}) target_link_libraries(cpp_dummy_build ${mbedcrypto_target} ${CMAKE_THREAD_LIBS_INIT})
endif() endif()
if(USE_SHARED_MBEDTLS_LIBRARY AND if(USE_SHARED_MBEDTLS_LIBRARY AND
@ -81,9 +83,9 @@ foreach(exe IN LISTS executables_libs executables_mbedcrypto)
# This emulates "if ( ... IN_LIST ... )" which becomes available in CMake 3.3 # This emulates "if ( ... IN_LIST ... )" which becomes available in CMake 3.3
list(FIND executables_libs ${exe} exe_index) list(FIND executables_libs ${exe} exe_index)
if (${exe_index} GREATER -1) if (${exe_index} GREATER -1)
target_link_libraries(${exe} ${libs}) target_link_libraries(${exe} ${libs} ${CMAKE_THREAD_LIBS_INIT})
else() else()
target_link_libraries(${exe} ${mbedcrypto_target}) target_link_libraries(${exe} ${mbedcrypto_target} ${CMAKE_THREAD_LIBS_INIT})
endif() endif()
endforeach() endforeach()

4
programs/test/cmake_subproject/CMakeLists.txt
View File

@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 3.5.1) cmake_minimum_required(VERSION 3.5.1)
find_package(Threads)
# Test the target renaming support by adding a prefix to the targets built # Test the target renaming support by adding a prefix to the targets built
set(MBEDTLS_TARGET_PREFIX subproject_test_) set(MBEDTLS_TARGET_PREFIX subproject_test_)
@ -20,4 +22,4 @@ set(libs
) )
add_executable(cmake_subproject cmake_subproject.c) add_executable(cmake_subproject cmake_subproject.c)
target_link_libraries(cmake_subproject ${libs}) target_link_libraries(cmake_subproject ${libs} ${CMAKE_THREAD_LIBS_INIT})

4
programs/util/CMakeLists.txt
View File

@ -1,3 +1,5 @@
find_package(Threads)
set(libs set(libs
${mbedcrypto_target} ${mbedcrypto_target}
) )
@ -9,7 +11,7 @@ set(executables
foreach(exe IN LISTS executables) foreach(exe IN LISTS executables)
add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>) add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>)
target_link_libraries(${exe} ${libs}) target_link_libraries(${exe} ${libs} ${CMAKE_THREAD_LIBS_INIT})
target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include) target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include)
endforeach() endforeach()

4
programs/x509/CMakeLists.txt
View File

@ -1,3 +1,5 @@
find_package(Threads)
set(libs set(libs
${mbedx509_target} ${mbedx509_target}
) )
@ -13,7 +15,7 @@ set(executables
foreach(exe IN LISTS executables) foreach(exe IN LISTS executables)
add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>) add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>)
target_link_libraries(${exe} ${libs}) target_link_libraries(${exe} ${libs} ${CMAKE_THREAD_LIBS_INIT})
target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include) target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include)
endforeach() endforeach()