From 8fa7e89fc5d7b996a821f3ccb789800a4287586a Mon Sep 17 00:00:00 2001 From: Ben Taylor Date: Wed, 25 Mar 2026 07:46:32 +0000 Subject: [PATCH 1/3] Add fix for -DENABLE_PROGRAMS=OFF build error Signed-off-by: Ben Taylor --- tests/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 09913b56e7..0ab601cc5b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -66,7 +66,9 @@ if(GEN_FILES) add_custom_target(handshake-generated.sh DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/opt-testcases/handshake-generated.sh) set_target_properties(handshake-generated.sh PROPERTIES EXCLUDE_FROM_ALL NO) +if(ENABLE_PROGRAMS) add_dependencies(${ssl_opt_target} handshake-generated.sh) +endif() add_custom_command( OUTPUT @@ -79,10 +81,12 @@ if(GEN_FILES) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/generate_tls13_compat_tests.py ) +if(ENABLE_PROGRAMS) add_custom_target(tls13-compat.sh DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/opt-testcases/tls13-compat.sh) set_target_properties(tls13-compat.sh PROPERTIES EXCLUDE_FROM_ALL NO) add_dependencies(${ssl_opt_target} tls13-compat.sh) +endif() else() foreach(file ${all_generated_data_files}) From 617f4d373d97bf2da94a3b9c7877b6b7d7942ac2 Mon Sep 17 00:00:00 2001 From: Ben Taylor Date: Mon, 13 Apr 2026 08:03:15 +0100 Subject: [PATCH 2/3] Add changelog Signed-off-by: Ben Taylor --- ChangeLog.d/fix-ENABLE_PROGRAMS-bug.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 ChangeLog.d/fix-ENABLE_PROGRAMS-bug.txt diff --git a/ChangeLog.d/fix-ENABLE_PROGRAMS-bug.txt b/ChangeLog.d/fix-ENABLE_PROGRAMS-bug.txt new file mode 100644 index 0000000000..36fc029885 --- /dev/null +++ b/ChangeLog.d/fix-ENABLE_PROGRAMS-bug.txt @@ -0,0 +1,2 @@ +Bugfix + * Add fix for -DENABLE_PROGRAMS=OFF build error reported in issue 10587. From 4204532c9e0d195887144846e9dc1278292a8c0f Mon Sep 17 00:00:00 2001 From: Ben Taylor Date: Wed, 3 Jun 2026 08:17:34 +0100 Subject: [PATCH 3/3] Update Changelog Signed-off-by: Ben Taylor --- ChangeLog.d/fix-ENABLE_PROGRAMS-bug.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.d/fix-ENABLE_PROGRAMS-bug.txt b/ChangeLog.d/fix-ENABLE_PROGRAMS-bug.txt index 36fc029885..c7658ec0b6 100644 --- a/ChangeLog.d/fix-ENABLE_PROGRAMS-bug.txt +++ b/ChangeLog.d/fix-ENABLE_PROGRAMS-bug.txt @@ -1,2 +1,2 @@ Bugfix - * Add fix for -DENABLE_PROGRAMS=OFF build error reported in issue 10587. + * Fix failure of cmake -DENABLE_PROGRAMS=OFF. Fixes #10587.