From b4251aac130785f0a9793d8fe2ea409207e12927 Mon Sep 17 00:00:00 2001
From: debris <marek.kotewicz@gmail.com>
Date: Sun, 7 Dec 2014 22:21:45 +0100
Subject: [PATCH] evm && ethcore working on windows

---
 libethcore/CMakeLists.txt | 10 +---------
 libevm/CMakeLists.txt     | 24 ++++--------------------
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/libethcore/CMakeLists.txt b/libethcore/CMakeLists.txt
index 99ae26776..869b6092b 100644
--- a/libethcore/CMakeLists.txt
+++ b/libethcore/CMakeLists.txt
@@ -14,21 +14,13 @@ file(GLOB HEADERS "*.h")
 if(ETH_STATIC)
 	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})	
+	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
 target_link_libraries(${EXECUTABLE} devcrypto)
 target_link_libraries(${EXECUTABLE} devcore)
 target_link_libraries(${EXECUTABLE} secp256k1)
-target_link_libraries(${EXECUTABLE} gmp)
-
-if (APPLE)
-	target_link_libraries(${EXECUTABLE} boost_system-mt)
-elseif (UNIX)
-	find_package(Boost 1.53 REQUIRED COMPONENTS system)
-	target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARY})
-endif()
 
 install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
diff --git a/libevm/CMakeLists.txt b/libevm/CMakeLists.txt
index 8815d123c..778bce8d9 100644
--- a/libevm/CMakeLists.txt
+++ b/libevm/CMakeLists.txt
@@ -5,6 +5,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
 
 aux_source_directory(. SRC_LIST)
 
+include_directories(..)
+include_directories(${LEVELDB_INCLUDE_DIR})
+
 set(EXECUTABLE evm)
 
 file(GLOB HEADERS "*.h")
@@ -14,36 +17,17 @@ else()
 	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
-include_directories(${LEVELDB_INCLUDE_DIR})
-include_directories(..)
+target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
 
 if(MINIUPNPC_LS)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()
 
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
-
 target_link_libraries(${EXECUTABLE} ethcore)
 target_link_libraries(${EXECUTABLE} devcrypto)
 target_link_libraries(${EXECUTABLE} evmcore)
 target_link_libraries(${EXECUTABLE} devcore)
 target_link_libraries(${EXECUTABLE} secp256k1)
-target_link_libraries(${EXECUTABLE} gmp)
-
-if (APPLE)
-	# Latest mavericks boost libraries only come with -mt
-	target_link_libraries(${EXECUTABLE} boost_system-mt)
-	target_link_libraries(${EXECUTABLE} boost_filesystem-mt)
-	target_link_libraries(${EXECUTABLE} boost_thread-mt)
-	find_package(Threads REQUIRED)
-	target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT})
-elseif (UNIX)
-	target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARY})
-	target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARY})
-	target_link_libraries(${EXECUTABLE} ${Boost_THREAD_LIBRARY})
-	target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARY})
-	target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT})
-endif ()
 
 install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )