From 2befafca7717af4dfea05e40e06101d0fc2316be Mon Sep 17 00:00:00 2001 From: Adam Wolk Date: Sat, 25 Nov 2017 20:15:29 +0100 Subject: [PATCH] cmake: only generate test cert when SERVER and TESTAPPS enabled apart from LWS_WITHOUT_TEST_SERVER the test server will also not be built if LWS_WITHOUT_TESTAPPS or LWS_WITHOUT_SERVER is defined, we update the CMake configuration to skip cert generation and installation in those cases. Signed-off-by: Adam Wolk --- CMakeLists.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d2514bb9..3d1e5278 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1285,7 +1285,7 @@ endif() set(GENCERTS 0) -if (LWS_WITH_SSL AND OPENSSL_EXECUTABLE AND NOT LWS_WITHOUT_TEST_SERVER) +if (LWS_WITH_SSL AND OPENSSL_EXECUTABLE AND NOT LWS_WITHOUT_TEST_SERVER AND NOT LWS_WITHOUT_SERVER AND NOT LWS_WITHOUT_TESTAPPS) set(GENCERTS 1) endif() if (LWS_WITH_ESP32) @@ -1938,9 +1938,12 @@ if (LWS_WITH_CGI) endif() endif() -install(FILES test-apps/lws-ssh-test-keys;test-apps/lws-ssh-test-keys.pub - DESTINATION share/libwebsockets-test-server - COMPONENT examples) + +if (NOT LWS_WITHOUT_TEST_SERVER AND NOT LWS_WITHOUT_SERVER AND NOT LWS_WITHOUT_TESTAPPS) + install(FILES test-apps/lws-ssh-test-keys;test-apps/lws-ssh-test-keys.pub + DESTINATION share/libwebsockets-test-server + COMPONENT examples) +endif() # plugins