From d915d00b5246aa16fc78c43298632cbc360e88e7 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Fri, 5 Jun 2020 11:47:07 +0200 Subject: [PATCH 1/2] programs: ssl: cmake: Reorder declaration of executables Reorder declaration of executables in alphabetic order. Signed-off-by: Ronald Cron Signed-off-by: Gilles Peskine --- programs/ssl/CMakeLists.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/ssl/CMakeLists.txt b/programs/ssl/CMakeLists.txt index 1e6563341..8664868da 100644 --- a/programs/ssl/CMakeLists.txt +++ b/programs/ssl/CMakeLists.txt @@ -8,12 +8,12 @@ set(libs set(targets dtls_client dtls_server + mini_client ssl_client1 ssl_client2 - ssl_server ssl_fork_server ssl_mail_client - mini_client + ssl_server ) if(USE_PKCS11_HELPER_LIBRARY) @@ -30,26 +30,26 @@ target_link_libraries(dtls_client ${libs}) add_executable(dtls_server dtls_server.c) target_link_libraries(dtls_server ${libs}) +add_executable(mini_client mini_client.c) +target_link_libraries(mini_client ${libs}) + add_executable(ssl_client1 ssl_client1.c) target_link_libraries(ssl_client1 ${libs}) add_executable(ssl_client2 ssl_client2.c) target_link_libraries(ssl_client2 ${libs}) -add_executable(ssl_server ssl_server.c) -target_link_libraries(ssl_server ${libs}) - -add_executable(ssl_server2 ssl_server2.c) -target_link_libraries(ssl_server2 ${libs}) - add_executable(ssl_fork_server ssl_fork_server.c) target_link_libraries(ssl_fork_server ${libs}) add_executable(ssl_mail_client ssl_mail_client.c) target_link_libraries(ssl_mail_client ${libs}) -add_executable(mini_client mini_client.c) -target_link_libraries(mini_client ${libs}) +add_executable(ssl_server ssl_server.c) +target_link_libraries(ssl_server ${libs}) + +add_executable(ssl_server2 ssl_server2.c) +target_link_libraries(ssl_server2 ${libs}) if(THREADS_FOUND) add_executable(ssl_pthread_server ssl_pthread_server.c) From 9b4b02396493d46fac2c9e05eda85ab7190f746c Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Fri, 5 Jun 2020 11:51:28 +0200 Subject: [PATCH 2/2] programs: ssl: cmake: Add missing executable Add the missing executable in the list of executables to install. Signed-off-by: Ronald Cron Signed-off-by: Gilles Peskine --- programs/ssl/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/ssl/CMakeLists.txt b/programs/ssl/CMakeLists.txt index 8664868da..0dd45342d 100644 --- a/programs/ssl/CMakeLists.txt +++ b/programs/ssl/CMakeLists.txt @@ -14,6 +14,7 @@ set(targets ssl_fork_server ssl_mail_client ssl_server + ssl_server2 ) if(USE_PKCS11_HELPER_LIBRARY)