From e5cf2dbbdd7812b5022d0265c702f12d6413812a Mon Sep 17 00:00:00 2001
From: Sergey Linev <S.Linev@gsi.de>
Date: Tue, 10 Apr 2018 20:02:11 +0200
Subject: [PATCH] http: do not set SSL defines when SSL are not used
If any SSL-related defines appeared in civetweb (even which says - do
not load SSL), civetweb starts to include ssl headers
---
net/http/CMakeLists.txt | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/net/http/CMakeLists.txt b/net/http/CMakeLists.txt
index 1efdf8c6fe1..dda8f911791 100644
--- a/net/http/CMakeLists.txt
+++ b/net/http/CMakeLists.txt
@@ -60,10 +60,14 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RHTTP
DEPENDENCIES Thread RIO)
target_compile_definitions(RHTTP PUBLIC -DUSE_WEBSOCKET)
-target_compile_definitions(RHTTP PUBLIC -DNO_SSL_DL)
-if (_ssl11)
- target_compile_definitions(RHTTP PUBLIC -DOPENSSL_API_1_1)
+
+if(ssl)
+ target_compile_definitions(RHTTP PUBLIC -DNO_SSL_DL)
+ if (_ssl11)
+ target_compile_definitions(RHTTP PUBLIC -DOPENSSL_API_1_1)
+ endif()
endif()
+
if(_nofcgi)
target_compile_definitions(RHTTP PUBLIC -DHTTP_WITHOUT_FASTCGI)
endif()
--
GitLab