From 34de22b648a83b283daac0a3557dd5ceaa4f75bf Mon Sep 17 00:00:00 2001 From: Andy Green Date: Thu, 18 Jun 2020 08:53:09 +0100 Subject: [PATCH] cmake: cleanups --- cmake/libwebsockets-config.cmake.in | 8 +++----- .../api-tests/api-test-secure-streams/CMakeLists.txt | 2 ++ .../minimal-http-client-captive-portal/CMakeLists.txt | 1 + .../http-client/minimal-http-client-multi/CMakeLists.txt | 2 ++ .../minimal-secure-streams.c | 1 + 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cmake/libwebsockets-config.cmake.in b/cmake/libwebsockets-config.cmake.in index c683335cc..e12464f8f 100644 --- a/cmake/libwebsockets-config.cmake.in +++ b/cmake/libwebsockets-config.cmake.in @@ -17,9 +17,7 @@ include(${LWS_CMAKE_DIR}/LibwebsocketsTargets.cmake) set(LIBWEBSOCKETS_LIBRARIES websockets websockets_shared) # These are additional libs that lws wants your app to also link to -if (NOT WIN32 AND NOT MSVC) - set(LIBWEBSOCKETS_DEP_LIBS @LIB_LIST_AT_END@) -else() - set(LIBWEBSOCKETS_DEP_LIBS) -endif() +foreach(item "@LIB_LIST_AT_END@") + list(APPEND LIBWEBSOCKETS_DEP_LIBS ${item}) +endforeach() diff --git a/minimal-examples/api-tests/api-test-secure-streams/CMakeLists.txt b/minimal-examples/api-tests/api-test-secure-streams/CMakeLists.txt index 98015b42a..6396f98d7 100644 --- a/minimal-examples/api-tests/api-test-secure-streams/CMakeLists.txt +++ b/minimal-examples/api-tests/api-test-secure-streams/CMakeLists.txt @@ -5,6 +5,8 @@ include(LwsCheckRequirements) set(requirements 1) require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements) +require_lws_config(LWS_WITH_TLS 1 requirements) + if (requirements) diff --git a/minimal-examples/http-client/minimal-http-client-captive-portal/CMakeLists.txt b/minimal-examples/http-client/minimal-http-client-captive-portal/CMakeLists.txt index e369b1b84..dcfc9832e 100644 --- a/minimal-examples/http-client/minimal-http-client-captive-portal/CMakeLists.txt +++ b/minimal-examples/http-client/minimal-http-client-captive-portal/CMakeLists.txt @@ -11,6 +11,7 @@ set(SRCS minimal-http-client-captive-portal.c) set(requirements 1) require_lws_config(LWS_ROLE_H1 1 requirements) +require_lws_config(LWS_WITH_TLS 1 requirements) require_lws_config(LWS_WITH_CLIENT 1 requirements) if (NOT WIN32 AND requirements) diff --git a/minimal-examples/http-client/minimal-http-client-multi/CMakeLists.txt b/minimal-examples/http-client/minimal-http-client-multi/CMakeLists.txt index 477175525..b71e09168 100644 --- a/minimal-examples/http-client/minimal-http-client-multi/CMakeLists.txt +++ b/minimal-examples/http-client/minimal-http-client-multi/CMakeLists.txt @@ -11,6 +11,8 @@ set(SRCS minimal-http-client-multi.c) set(requirements 1) require_lws_config(LWS_ROLE_H1 1 requirements) require_lws_config(LWS_WITH_CLIENT 1 requirements) +require_lws_config(LWS_WITH_TLS 1 requirements) + if (requirements) add_executable(${SAMP} ${SRCS}) diff --git a/minimal-examples/secure-streams/minimal-secure-streams-policy2c/minimal-secure-streams.c b/minimal-examples/secure-streams/minimal-secure-streams-policy2c/minimal-secure-streams.c index 0dfa5fa13..4f0c0a46c 100644 --- a/minimal-examples/secure-streams/minimal-secure-streams-policy2c/minimal-secure-streams.c +++ b/minimal-examples/secure-streams/minimal-secure-streams-policy2c/minimal-secure-streams.c @@ -20,6 +20,7 @@ #include #include #include +#include #include static int interrupted, bad = 1;