From fc253b38bb3eff28df7fbb6c9d49701cbb2ba637 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Fri, 5 Jun 2020 11:47:07 +0200 Subject: [PATCH 1/3] 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 | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/ssl/CMakeLists.txt b/programs/ssl/CMakeLists.txt index 803920cd..9d816b98 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,6 +30,9 @@ 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}) @@ -37,21 +40,18 @@ add_executable(ssl_client2 ssl_client2.c) target_sources(ssl_client2 PUBLIC query_config.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_sources(ssl_server2 PUBLIC query_config.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_sources(ssl_server2 PUBLIC query_config.c) +target_link_libraries(ssl_server2 ${libs}) if(THREADS_FOUND) add_executable(ssl_pthread_server ssl_pthread_server.c) From c7f8aec493ba407f54a17281952f8568b8e563d9 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Fri, 5 Jun 2020 11:51:28 +0200 Subject: [PATCH 2/3] 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 9d816b98..1460aa97 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) From c9914ecd01396529a88ebfb85c9e3aa6253ed86d Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Fri, 5 Jun 2020 14:02:43 +0200 Subject: [PATCH 3/3] programs: cmake: Fix relative path warnings The path to source files were relative which triggered warnings when generating the build system. Move to absolute paths based on CMAKE_CURRENT_SOURCE_DIR. Signed-off-by: Ronald Cron Signed-off-by: Gilles Peskine --- programs/ssl/CMakeLists.txt | 4 ++-- programs/test/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/ssl/CMakeLists.txt b/programs/ssl/CMakeLists.txt index 1460aa97..b3ef4f8e 100644 --- a/programs/ssl/CMakeLists.txt +++ b/programs/ssl/CMakeLists.txt @@ -38,7 +38,7 @@ add_executable(ssl_client1 ssl_client1.c) target_link_libraries(ssl_client1 ${libs}) add_executable(ssl_client2 ssl_client2.c) -target_sources(ssl_client2 PUBLIC query_config.c) +target_sources(ssl_client2 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/query_config.c) target_link_libraries(ssl_client2 ${libs}) add_executable(ssl_fork_server ssl_fork_server.c) @@ -51,7 +51,7 @@ add_executable(ssl_server ssl_server.c) target_link_libraries(ssl_server ${libs}) add_executable(ssl_server2 ssl_server2.c) -target_sources(ssl_server2 PUBLIC query_config.c) +target_sources(ssl_server2 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/query_config.c) target_link_libraries(ssl_server2 ${libs}) if(THREADS_FOUND) diff --git a/programs/test/CMakeLists.txt b/programs/test/CMakeLists.txt index 282ef58a..5feb3177 100644 --- a/programs/test/CMakeLists.txt +++ b/programs/test/CMakeLists.txt @@ -28,7 +28,7 @@ add_executable(zeroize zeroize.c) target_link_libraries(zeroize ${libs}) add_executable(query_compile_time_config query_compile_time_config.c) -target_sources(query_compile_time_config PUBLIC ../ssl/query_config.c) +target_sources(query_compile_time_config PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ssl/query_config.c) target_link_libraries(query_compile_time_config ${libs}) install(TARGETS selftest benchmark udp_proxy query_compile_time_config