From c3650df13dea6ea27ee2c8016597e229fbdaf122 Mon Sep 17 00:00:00 2001 From: psychocrypt Date: Wed, 19 Apr 2017 21:40:16 +0200 Subject: [PATCH 1/2] extend `.gitignore` --- .gitignore | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitignore b/.gitignore index 8356f53..60a43db 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,12 @@ obj/ xmr-stak-cpu.layout xmr-stak-cpu.depend config-debug.txt + +# netbeans project files +/nbproject/ + +# tmp files +*~ + +# merge original backup files +*.orig From 91fd7e20b18895818719419276c155a440cf51db Mon Sep 17 00:00:00 2001 From: psychocrypt Date: Wed, 19 Apr 2017 21:42:29 +0200 Subject: [PATCH 2/2] always build feature complete - throw an error if a compile dependancy is not fullfilled - add options to disable hard compile dependancies --- CMakeLists.txt | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 49b7065..5aa8b16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,10 +45,15 @@ 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") - message(STATUS "microhttpd NOT found: disable http server") - add_definitions("-DCONF_NO_HTTPD") + if(MICROHTTPD_REQUIRED) + message(FATAL_ERROR "microhttpd NOT found: use `-DMICROHTTPD_REQUIRED=OFF` to build without http deamon support") + else() + message(STATUS "microhttpd NOT found: disable http server") + add_definitions("-DCONF_NO_HTTPD") + endif() else() set(LIBS ${LIBS} ${MHTD}) endif() @@ -57,11 +62,19 @@ endif() # Find OpenSSL ############################################################################### +option(OpenSSL_REQUIRED "Enable or disable the requirement of OpenSSL" ON) find_package(OpenSSL) -include_directories(${OPENSSL_INCLUDE_DIR}) -set(LIBS ${LIBS} ${OPENSSL_LIBRARIES}) -if(NOT OPENSSL_FOUND) - add_definitions("-DCONF_NO_TLS") +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") + else() + if(NOT OPENSSL_FOUND) + add_definitions("-DCONF_NO_TLS") + endif() + endif() endif() ################################################################################