Cleanup and added integrated tls config params parsing
This commit is contained in:
parent
b26c1d637a
commit
69afccf762
16 changed files with 72 additions and 40 deletions
|
@ -10,7 +10,7 @@ option(WITH_AEON "CryptoNight-Lite support" ON)
|
|||
option(WITH_HTTPD "HTTP REST API" OFF)
|
||||
option(WITH_CC_CLIENT "CC Client" ON)
|
||||
option(WITH_CC_SERVER "CC Server" ON)
|
||||
option(WITH_SSL_TLS "SSL/TLS support" ON)
|
||||
option(WITH_TLS "TLS support" ON)
|
||||
|
||||
include (CheckIncludeFile)
|
||||
include (cmake/cpu.cmake)
|
||||
|
@ -112,7 +112,7 @@ find_package(UV REQUIRED)
|
|||
|
||||
include(cmake/flags.cmake)
|
||||
|
||||
if (WITH_SSL_TLS)
|
||||
if (WITH_TLS)
|
||||
find_package(OpenSSL REQUIRED)
|
||||
|
||||
add_definitions(/DCPPHTTPLIB_OPENSSL_SUPPORT)
|
||||
|
@ -121,10 +121,10 @@ if (WITH_SSL_TLS)
|
|||
include_directories(${OPENSSL_INCLUDE_DIR})
|
||||
set(SOURCES_SSL_TLS src/3rdparty/clib-net/src/tls.c)
|
||||
else()
|
||||
message(FATAL_ERROR "OpenSSL NOT found: use `-DWITH_SSL_TLS=OFF` to build without SSL/TLS support")
|
||||
message(FATAL_ERROR "OpenSSL NOT found: use `-DWITH_TLS=OFF` to build without TLS support")
|
||||
endif()
|
||||
else()
|
||||
add_definitions(/DXMRIG_NO_SSL_TLS)
|
||||
add_definitions(/DXMRIG_NO_TLS)
|
||||
endif()
|
||||
|
||||
if (WITH_LIBCPUID)
|
||||
|
@ -208,9 +208,9 @@ add_library(xmrig_common STATIC ${SOURCES_COMMON})
|
|||
add_library(xmrig_os_dependencies STATIC ${SOURCES_OS} ${SOURCES_SYSLOG})
|
||||
add_library(xmrig_cpuid STATIC ${SOURCES_CPUID})
|
||||
|
||||
if (WITH_SSL_TLS)
|
||||
if (WITH_TLS)
|
||||
add_library(xmrig_tls STATIC ${SOURCES_SSL_TLS})
|
||||
endif (WITH_SSL_TLS)
|
||||
endif (WITH_TLS)
|
||||
|
||||
if (WITH_CC_SERVER OR WITH_CC_CLIENT)
|
||||
add_library(xmrig_cc_common STATIC ${SOURCES_CC_COMMON})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue