coffee/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-10-28 18:07:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10799 from bjwtaylor/no-program-failure-4.1

Browse Source 
Backport 4.1: Add fix for -DENABLE_PROGRAMS=OFF build error
This commit is contained in:
Valerio Setti 2026-10-21 15:41:24 +00:00 committed by GitHub
commit 0d13af54a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.d/fix-ENABLE_PROGRAMS-bug.txt Normal file
View File

@ -0,0 +1,2 @@
Bugfix
* Fix failure of cmake -DENABLE_PROGRAMS=OFF. Fixes #10587.

4
tests/CMakeLists.txt
View File

@ -66,7 +66,9 @@ if(GEN_FILES)
add_custom_target(handshake-generated.sh add_custom_target(handshake-generated.sh
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/opt-testcases/handshake-generated.sh) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/opt-testcases/handshake-generated.sh)
set_target_properties(handshake-generated.sh PROPERTIES EXCLUDE_FROM_ALL NO) set_target_properties(handshake-generated.sh PROPERTIES EXCLUDE_FROM_ALL NO)
if(ENABLE_PROGRAMS)
add_dependencies(${ssl_opt_target} handshake-generated.sh) add_dependencies(${ssl_opt_target} handshake-generated.sh)
endif()
add_custom_command( add_custom_command(
OUTPUT OUTPUT
@ -79,10 +81,12 @@ if(GEN_FILES)
DEPENDS DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/generate_tls13_compat_tests.py ${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/generate_tls13_compat_tests.py
) )
if(ENABLE_PROGRAMS)
add_custom_target(tls13-compat.sh add_custom_target(tls13-compat.sh
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/opt-testcases/tls13-compat.sh) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/opt-testcases/tls13-compat.sh)
set_target_properties(tls13-compat.sh PROPERTIES EXCLUDE_FROM_ALL NO) set_target_properties(tls13-compat.sh PROPERTIES EXCLUDE_FROM_ALL NO)
add_dependencies(${ssl_opt_target} tls13-compat.sh) add_dependencies(${ssl_opt_target} tls13-compat.sh)
endif()
else() else()
foreach(file ${all_generated_data_files}) foreach(file ${all_generated_data_files})