From f459abdc247879db8557f9d2f64d80020ee4e441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Tue, 21 Mar 2017 00:04:17 +0100 Subject: [PATCH] Remove MHD dependency --- cmake/EthDependencies.cmake | 5 ---- cmake/FindMHD.cmake | 54 ------------------------------------- ethminer/CMakeLists.txt | 1 - 3 files changed, 60 deletions(-) delete mode 100644 cmake/FindMHD.cmake diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake index b02c7ae4b..2c206f84f 100644 --- a/cmake/EthDependencies.cmake +++ b/cmake/EthDependencies.cmake @@ -54,11 +54,6 @@ find_package (json_rpc_cpp 0.4 REQUIRED) message (" - json-rpc-cpp header: ${JSON_RPC_CPP_INCLUDE_DIRS}") message (" - json-rpc-cpp lib : ${JSON_RPC_CPP_LIBRARIES}") -find_package(MHD) -message(" - microhttpd header: ${MHD_INCLUDE_DIRS}") -message(" - microhttpd lib : ${MHD_LIBRARIES}") -message(" - microhttpd dll : ${MHD_DLLS}") - # curl is only requried for tests # TODO specify min curl version, on windows we are currently using 7.29 find_package (CURL) diff --git a/cmake/FindMHD.cmake b/cmake/FindMHD.cmake deleted file mode 100644 index 06bab8ced..000000000 --- a/cmake/FindMHD.cmake +++ /dev/null @@ -1,54 +0,0 @@ -# Find microhttpd -# -# Find the microhttpd includes and library -# -# if you need to add a custom library search path, do it via via CMAKE_PREFIX_PATH -# -# This module defines -# MHD_INCLUDE_DIRS, where to find header, etc. -# MHD_LIBRARIES, the libraries needed to use jsoncpp. -# MHD_FOUND, If false, do not try to use jsoncpp. - -find_path( - MHD_INCLUDE_DIR - NAMES microhttpd.h - DOC "microhttpd include dir" -) - -find_library( - MHD_LIBRARY - NAMES microhttpd microhttpd-10 libmicrohttpd libmicrohttpd-dll - DOC "microhttpd library" -) - -set(MHD_INCLUDE_DIRS ${MHD_INCLUDE_DIR}) -set(MHD_LIBRARIES ${MHD_LIBRARY}) - -# debug library on windows -# same naming convention as in QT (appending debug library with d) -# boost is using the same "hack" as us with "optimized" and "debug" -# official MHD project actually uses _d suffix -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - - find_library( - MHD_LIBRARY_DEBUG - NAMES microhttpd_d microhttpd-10_d libmicrohttpd_d libmicrohttpd-dll_d - DOC "mhd debug library" - ) - - set(MHD_LIBRARIES optimized ${MHD_LIBRARIES} debug ${MHD_LIBRARY_DEBUG}) - - # prepare dlls - string(REPLACE ".lib" ".dll" MHD_DLL ${MHD_LIBRARY}) - string(REPLACE "/lib/" "/bin/" MHD_DLL ${MHD_DLL}) - string(REPLACE ".lib" ".dll" MHD_DLL_DEBUG ${MHD_LIBRARY_DEBUG}) - string(REPLACE "/lib/" "/bin/" MHD_DLL_DEBUG ${MHD_DLL_DEBUG}) - set(MHD_DLLS optimized ${MHD_DLL} debug ${MHD_DLL_DEBUG}) - -endif() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(mhd DEFAULT_MSG - MHD_INCLUDE_DIR MHD_LIBRARY) - -mark_as_advanced(MHD_INCLUDE_DIR MHD_LIBRARY) diff --git a/ethminer/CMakeLists.txt b/ethminer/CMakeLists.txt index 41bea45ce..7f8aad61c 100644 --- a/ethminer/CMakeLists.txt +++ b/ethminer/CMakeLists.txt @@ -42,7 +42,6 @@ target_link_libraries(${EXECUTABLE} ethstratum) endif() if (DEFINED WIN32 AND NOT DEFINED CMAKE_COMPILER_IS_MINGW) - eth_copy_dlls("${EXECUTABLE}" MHD_DLLS) eth_copy_dlls("${EXECUTABLE}" OpenCL_DLLS) endif()