[thrift] branch master updated: Compile TWebSocketServer with CMake only when OpenSSL is found

[je...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git


The following commit(s) were added to refs/heads/master by this push:
     new 2853af2  Compile TWebSocketServer with CMake only when OpenSSL is found
2853af2 is described below

commit 2853af2d02dc1c4e42175e76d5ccefe9e797c4c4
Author: Kevin Wojniak <ka...@users.noreply.github.com>
AuthorDate: Wed Oct 20 20:56:29 2021 -0700

    Compile TWebSocketServer with CMake only when OpenSSL is found
    
    When compiling the C++ library and OpenSSL wasn't found, TWebSocketServer will fail as it includes OpenSSL headers.
---
 lib/cpp/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt
index c84e6e2..13b41c5 100755
--- a/lib/cpp/CMakeLists.txt
+++ b/lib/cpp/CMakeLists.txt
@@ -54,8 +54,6 @@ set(thriftcpp_SOURCES
    src/thrift/transport/TServerSocket.cpp
    src/thrift/transport/TTransportUtils.cpp
    src/thrift/transport/TBufferTransports.cpp
-   src/thrift/transport/TWebSocketServer.h
-   src/thrift/transport/TWebSocketServer.cpp
    src/thrift/transport/SocketCommon.cpp
    src/thrift/server/TConnectedClient.cpp
    src/thrift/server/TServerFramework.cpp
@@ -102,6 +100,8 @@ if(OPENSSL_FOUND AND WITH_OPENSSL)
     list(APPEND thriftcpp_SOURCES
        src/thrift/transport/TSSLSocket.cpp
        src/thrift/transport/TSSLServerSocket.cpp
+       src/thrift/transport/TWebSocketServer.h
+       src/thrift/transport/TWebSocketServer.cpp
     )
     if(TARGET OpenSSL::SSL OR TARGET OpenSSL::Crypto)
         if(TARGET OpenSSL::SSL)