From 46a78d383d643b9e3de273bf9f6e44a39ced078d Mon Sep 17 00:00:00 2001 From: ruanshudong Date: Mon, 9 Mar 2020 16:06:59 +0800 Subject: [PATCH] support windows compiler --- cmake/Thirdparty.cmake | 6 +++--- servant/protocol | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/Thirdparty.cmake b/cmake/Thirdparty.cmake index 9d0c517..496166f 100755 --- a/cmake/Thirdparty.cmake +++ b/cmake/Thirdparty.cmake @@ -11,9 +11,9 @@ option(TARS_PROTOBUF "option for protocol" OFF) if (TARS_MYSQL) add_definitions(-DTARS_MYSQL=1) - if(WIN32) - set(TARS_SSL ON) - endif() +# if(WIN32) +# set(TARS_SSL ON) +# endif() IF(UNIX AND NOT APPLE) FIND_PACKAGE(Curses) diff --git a/servant/protocol b/servant/protocol index 0c24c6a..504ebee 160000 --- a/servant/protocol +++ b/servant/protocol @@ -1 +1 @@ -Subproject commit 0c24c6a8ea0406c0c3dc6e8e56bc895996bb9cd6 +Subproject commit 504ebee584ac972943a9ffef7b738114300793e4