From b352b360e1324c46b90dd6e8614aed4abfa8fbfb Mon Sep 17 00:00:00 2001 From: psychocrypt Date: Mon, 1 May 2017 21:11:22 +0200 Subject: [PATCH 1/2] allow to fully disable OpenSSL and microhttpd - rename option `*_REQUIRED` to `*_ENABLE` - allow to disable the dependency OpenSSL and microhttpd --- CMakeLists.txt | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 68d2432..2373d85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,36 +48,33 @@ set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) # Find microhttpd ################################################################################ -option(MICROHTTPD_REQUIRED "Enable or disable the requirement of microhttp (http deamon)" ON) -find_library(MHTD NAMES microhttpd) -if("${MHTD}" STREQUAL "MHTD-NOTFOUND") - if(MICROHTTPD_REQUIRED) - message(FATAL_ERROR "microhttpd NOT found: use `-DMICROHTTPD_REQUIRED=OFF` to build without http deamon support") +option(MICROHTTPD_ENABLE "Enable or disable the requirement of microhttp (http deamon)" ON) +if(MICROHTTPD_ENABLE) + find_library(MHTD NAMES microhttpd) + if("${MHTD}" STREQUAL "MHTD-NOTFOUND") + message(FATAL_ERROR "microhttpd NOT found: use `-DMICROHTTPD_ENABLE=OFF` to build without http deamon support") else() - message(STATUS "microhttpd NOT found: disable http server") - add_definitions("-DCONF_NO_HTTPD") + set(LIBS ${LIBS} ${MHTD}) endif() else() - set(LIBS ${LIBS} ${MHTD}) + add_definitions("-DCONF_NO_HTTPD") endif() ############################################################################### # Find OpenSSL ############################################################################### -option(OpenSSL_REQUIRED "Enable or disable the requirement of OpenSSL" ON) -find_package(OpenSSL) -if(OPENSSL_FOUND) - include_directories(${OPENSSL_INCLUDE_DIR}) - set(LIBS ${LIBS} ${OPENSSL_LIBRARIES}) -else() - if(OpenSSL_REQUIRED) - message(FATAL_ERROR "OpenSSL NOT found: use `-DOpenSSL_REQUIRED=OFF` to build without SSL support") +option(OpenSSL_ENABLE "Enable or disable the requirement of OpenSSL" ON) +if(OpenSSL_ENABLE) + find_package(OpenSSL) + if(OPENSSL_FOUND) + include_directories(${OPENSSL_INCLUDE_DIR}) + set(LIBS ${LIBS} ${OPENSSL_LIBRARIES}) else() - if(NOT OPENSSL_FOUND) - add_definitions("-DCONF_NO_TLS") - endif() + message(FATAL_ERROR "OpenSSL NOT found: use `-DOpenSSL_ENABLE=OFF` to build without SSL support") endif() +else() + add_definitions("-DCONF_NO_TLS") endif() ################################################################################ From ab5b708b11adcd5096942f768de30c4040922033 Mon Sep 17 00:00:00 2001 From: psychocrypt Date: Mon, 1 May 2017 21:21:16 +0200 Subject: [PATCH 2/2] update documentation change variable names to disable or enable microhttpd and OpenSSL --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3cd3996..c132245 100644 --- a/README.md +++ b/README.md @@ -168,12 +168,12 @@ and install. -`CMAKE_BUILD_TYPE` set the build type - valid options: `Release` or `Debug` - you should always keep `Release` for your productive miners -- `MICROHTTPD_REQUIRED` allow to disable/enable the dependency *microhttpd* +- `MICROHTTPD_ENABLE` allow to disable/enable the dependency *microhttpd* - by default enabled - - there is no *http* interface available if option is disabled: `cmake . -DMICROHTTPD_REQUIRED=OFF` -- `OpenSSL_REQUIRED`allow to disable/enable the dependency *OpenSSL* + - there is no *http* interface available if option is disabled: `cmake . -DMICROHTTPD_ENABLE=OFF` +- `OpenSSL_ENABLE`allow to disable/enable the dependency *OpenSSL* - by default enabled - - it is not possible to connect to a *https* secured pool if optin is disabled: `cmake . -DOpenSSL_REQUIRED=OFF` + - it is not possible to connect to a *https* secured pool if optin is disabled: `cmake . -DOpenSSL_ENABLE=OFF` ## PGP Key ```