From b6773a30841c307f0afb2f2abbba28f2f76728bf Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Sun, 22 Feb 2015 02:00:19 +0100
Subject: [PATCH] fixed microhttpd deployment

---
 alethzero/CMakeLists.txt        |  2 +-
 cmake/EthExecutableHelper.cmake | 11 ++++++++++-
 cmake/FindMHD.cmake             | 10 ++++++++--
 third/CMakeLists.txt            |  2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/alethzero/CMakeLists.txt b/alethzero/CMakeLists.txt
index 008721518..9cb1a0ff7 100644
--- a/alethzero/CMakeLists.txt
+++ b/alethzero/CMakeLists.txt
@@ -58,5 +58,5 @@ if (NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC"))
 endif()
 
 # eth_install_executable is defined in cmake/EthExecutableHelper.cmake
-eth_install_executable(${EXECUTABLE})
+eth_install_executable(${EXECUTABLE} DLLS ${MHD_DLL_RELEASE})
 
diff --git a/cmake/EthExecutableHelper.cmake b/cmake/EthExecutableHelper.cmake
index c6e0210de..0c2f72946 100644
--- a/cmake/EthExecutableHelper.cmake
+++ b/cmake/EthExecutableHelper.cmake
@@ -56,7 +56,7 @@ macro(eth_install_executable EXECUTABLE)
 	set (extra_macro_args ${ARGN})
 	set (options)
 	set (one_value_args QMLDIR)
-	set (multi_value_args)
+	set (multi_value_args DLLS)
 	cmake_parse_arguments (ETH_INSTALL_EXECUTABLE "${options}" "${one_value_args}" "${multi_value_args}" "${extra_macro_args}")
 	
 	if (ETH_INSTALL_EXECUTABLE_QMLDIR)
@@ -99,6 +99,15 @@ macro(eth_install_executable EXECUTABLE)
 			COMMAND cmd /C "(echo [Paths] & echo.Prefix=.)" > "qt.conf"
 			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} VERBATIM
 		)
+
+		#copy additional dlls
+		foreach(dll ${ETH_INSTALL_EXECUTABLE_DLLS})
+			add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
+			COMMAND ${CMAKE_COMMAND}
+			ARGS -E copy ${dll} "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
+		)
+		endforeach(dll)
+
 		install( TARGETS ${EXECUTABLE} RUNTIME 
 			DESTINATION bin
 			COMPONENT ${EXECUTABLE}
diff --git a/cmake/FindMHD.cmake b/cmake/FindMHD.cmake
index 84875bc47..5cb8a98d6 100755
--- a/cmake/FindMHD.cmake
+++ b/cmake/FindMHD.cmake
@@ -29,13 +29,19 @@ set(MHD_LIBRARIES ${MHD_LIBRARY})
 # 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")
+
+	#TODO: place dlls into CMAKE_CFG_INTDIR subfolders
+	string(REPLACE ".lib" ".dll" MHD_DLL_RELEASE ${MHD_LIBRARY})
+	string(REPLACE "/lib/" "/bin/" MHD_DLL_RELEASE ${MHD_DLL_RELEASE})
+
 	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})
+	# always use release for now
+	#string(REPLACE ".lib" ".dll" MHD_DLL_DEBUG ${MHD_LIBRARY_DEBUG})
+	#set(MHD_LIBRARIES optimized ${MHD_LIBRARIES} debug ${MHD_LIBRARY_DEBUG})
 
 endif()
 
diff --git a/third/CMakeLists.txt b/third/CMakeLists.txt
index bde47988b..989677626 100644
--- a/third/CMakeLists.txt
+++ b/third/CMakeLists.txt
@@ -51,5 +51,5 @@ target_link_libraries(${EXECUTABLE} web3jsonrpc)
 target_link_libraries(${EXECUTABLE} jsqrc) 
 
 # eth_install_executable is defined in cmake/EthExecutableHelper.cmake
-eth_install_executable(${EXECUTABLE})
+eth_install_executable(${EXECUTABLE} DLLS ${MHD_DLL_RELEASE})