From e7f34beb45516759120bbc89cbc4f280a9d479f1 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Thu, 16 Jul 2015 23:05:29 +0200
Subject: [PATCH] fixed eth_copy_dlls

reverted libsecp256k1 changes
---
 CMakeLists.txt                  |  8 +++++---
 cmake/EthExecutableHelper.cmake | 14 ++++++++++----
 evmjit/libevmjit/CMakeLists.txt |  1 +
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48f1efee0..ceae8554c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -369,7 +369,7 @@ if (EVMJIT)
 	set(EVMJIT_CPP TRUE) # include CPP-JIT connector
 	add_subdirectory(evmjit)
 	if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-		get_property(EVMJIT_DLLS_LOCAL TARGET "evmjit" PROPERTY LOCATION)
+		set(EVMJIT_DLLS_LOCAL $<TARGET_FILE:evmjit>)
 		set(EVMJIT_DLLS optimized ${EVMJIT_DLLS_LOCAL} debug ${EVMJIT_DLLS_LOCAL})
 	endif()
 endif()
@@ -413,8 +413,10 @@ if (JSCONSOLE)
 	add_subdirectory(ethconsole)
 endif ()
 
-add_definitions(-DETH_HAVE_SECP256K1)
-add_subdirectory(secp256k1)
+if (NOT WIN32)
+	add_definitions(-DETH_HAVE_SECP256K1)
+	add_subdirectory(secp256k1)
+endif ()
 
 add_subdirectory(libscrypt)
 add_subdirectory(libdevcrypto)
diff --git a/cmake/EthExecutableHelper.cmake b/cmake/EthExecutableHelper.cmake
index 1d1cb887b..1fa02bb40 100644
--- a/cmake/EthExecutableHelper.cmake
+++ b/cmake/EthExecutableHelper.cmake
@@ -43,11 +43,11 @@ macro(eth_add_executable EXECUTABLE)
 
 endmacro()
 
-macro(eth_copy_dlls EXECUTABLE DLLS)
+macro(eth_copy_dll EXECUTABLE DLL)
 	# dlls must be unsubstitud list variable (without ${}) in format
 	# optimized;path_to_dll.dll;debug;path_to_dlld.dll 
-	list(GET ${DLLS} 1 DLL_RELEASE)
-	list(GET ${DLLS} 3 DLL_DEBUG)
+	list(GET ${DLL} 1 DLL_RELEASE)
+	list(GET ${DLL} 3 DLL_DEBUG)
 	add_custom_command(TARGET ${EXECUTABLE}
 		POST_BUILD 
 		COMMAND ${CMAKE_COMMAND} ARGS 
@@ -59,6 +59,12 @@ macro(eth_copy_dlls EXECUTABLE DLLS)
 	)
 endmacro()
 
+macro(eth_copy_dlls EXECUTABLE)
+	foreach(dll ${ARGN})
+		eth_copy_dll(${EXECUTABLE} ${dll})
+	endforeach(dll)
+endmacro()
+
 # 
 # this function requires the following variables to be specified:
 # ETH_DEPENDENCY_INSTALL_DIR
@@ -124,7 +130,7 @@ macro(eth_install_executable EXECUTABLE)
 
 		#copy additional dlls
 		foreach(dll ${ETH_INSTALL_EXECUTABLE_DLLS})
-			eth_copy_dlls(${EXECUTABLE} ${dll})
+			eth_copy_dll(${EXECUTABLE} ${dll})
 		endforeach(dll)
 
 		install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Debug"
diff --git a/evmjit/libevmjit/CMakeLists.txt b/evmjit/libevmjit/CMakeLists.txt
index a41c7b365..80108e15b 100644
--- a/evmjit/libevmjit/CMakeLists.txt
+++ b/evmjit/libevmjit/CMakeLists.txt
@@ -29,6 +29,7 @@ else()
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 endif()
 
+
 set(EVMJIT_VERSION "0.0.0")
 set(EVMJIT_VERSION_MAJOR 0)
 set(EVMJIT_VERSION_MINOR 0)