[thrift] branch master updated: THRIFT-5047:fix openssl switch Client: cpp Patch: Yuanyuan Chen

[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 13e6f9e  THRIFT-5047:fix openssl switch Client: cpp Patch: Yuanyuan Chen
13e6f9e is described below

commit 13e6f9ec89ae4f8f87165eccea88442e83afb314
Author: cyy <cy...@outlook.com>
AuthorDate: Thu Dec 12 21:13:31 2019 +0800

    THRIFT-5047:fix openssl switch
    Client: cpp
    Patch: Yuanyuan Chen
    
    This closes #1962
---
 lib/cpp/CMakeLists.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt
index 9b987ae..d705bb3 100755
--- a/lib/cpp/CMakeLists.txt
+++ b/lib/cpp/CMakeLists.txt
@@ -125,11 +125,17 @@ set( thriftcpp_threads_SOURCES
 set( thriftcppnb_SOURCES
     src/thrift/server/TNonblockingServer.cpp
     src/thrift/transport/TNonblockingServerSocket.cpp
-    src/thrift/transport/TNonblockingSSLServerSocket.cpp
     src/thrift/async/TEvhttpServer.cpp
     src/thrift/async/TEvhttpClientChannel.cpp
 )
 
+# If OpenSSL is not found or disabled just ignore the OpenSSL stuff
+if(OPENSSL_FOUND AND WITH_OPENSSL)
+    list( APPEND thriftcppnb_SOURCES
+    src/thrift/transport/TNonblockingSSLServerSocket.cpp
+    )
+endif()
+
 # Thrift zlib transport
 set( thriftcppz_SOURCES
     src/thrift/transport/TZlibTransport.cpp