From 70eafae18736d4c59728b897f54d60de3e525761 Mon Sep 17 00:00:00 2001
From: debris <marek.kotewicz@gmail.com>
Date: Sun, 8 Feb 2015 21:41:42 +0100
Subject: [PATCH 1/3] fixed arrays << error in msvc

---
 libdevcore/CommonIO.h | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/libdevcore/CommonIO.h b/libdevcore/CommonIO.h
index d2a67921b..23092b702 100644
--- a/libdevcore/CommonIO.h
+++ b/libdevcore/CommonIO.h
@@ -57,7 +57,7 @@ template <class S, class T> struct StreamOut { static S& bypass(S& _out, T const
 template <class S> struct StreamOut<S, uint8_t> { static S& bypass(S& _out, uint8_t const& _t) { _out << (int)_t; return _out; } };
 
 template <class T> inline std::ostream& operator<<(std::ostream& _out, std::vector<T> const& _e);
-template <class T, unsigned Z> inline std::ostream& operator<<(std::ostream& _out, std::array<T, Z> const& _e);
+template <class T, std::size_t Z> inline std::ostream& operator<<(std::ostream& _out, std::array<T, Z> const& _e);
 template <class T, class U> inline std::ostream& operator<<(std::ostream& _out, std::pair<T, U> const& _e);
 template <class T> inline std::ostream& operator<<(std::ostream& _out, std::list<T> const& _e);
 template <class T1, class T2, class T3> inline std::ostream& operator<<(std::ostream& _out, std::tuple<T1, T2, T3> const& _e);
@@ -84,7 +84,7 @@ inline S& streamout(S& _out, std::vector<T> const& _e)
 
 template <class T> inline std::ostream& operator<<(std::ostream& _out, std::vector<T> const& _e) { streamout(_out, _e); return _out; }
 
-template <class S, class T, unsigned Z>
+template <class S, class T, std::size_t Z>
 inline S& streamout(S& _out, std::array<T, Z> const& _e)
 {
 	_out << "[";
@@ -98,23 +98,7 @@ inline S& streamout(S& _out, std::array<T, Z> const& _e)
 	_out << "]";
 	return _out;
 }
-template <class T, unsigned Z> inline std::ostream& operator<<(std::ostream& _out, std::array<T, Z> const& _e) { streamout(_out, _e); return _out; }
-
-template <class S, class T, unsigned long Z>
-inline S& streamout(S& _out, std::array<T, Z> const& _e)
-{
-	_out << "[";
-	if (!_e.empty())
-	{
-		StreamOut<S, T>::bypass(_out, _e.front());
-		auto i = _e.begin();
-		for (++i; i != _e.end(); ++i)
-			StreamOut<S, T>::bypass(_out << ",", *i);
-	}
-	_out << "]";
-	return _out;
-}
-template <class T, unsigned long Z> inline std::ostream& operator<<(std::ostream& _out, std::array<T, Z> const& _e) { streamout(_out, _e); return _out; }
+template <class T, std::size_t Z> inline std::ostream& operator<<(std::ostream& _out, std::array<T, Z> const& _e) { streamout(_out, _e); return _out; }
 
 template <class S, class T>
 inline S& streamout(S& _out, std::list<T> const& _e)

From 92bfd9181208f9e9c66f0b9d3f8b3e0e0107fd70 Mon Sep 17 00:00:00 2001
From: debris <marek.kotewicz@gmail.com>
Date: Sun, 8 Feb 2015 21:56:15 +0100
Subject: [PATCH 2/3] cmake mess

---
 alethzero/CMakeLists.txt      | 9 ++++++---
 eth/CMakeLists.txt            | 1 +
 libweb3jsonrpc/CMakeLists.txt | 5 ++++-
 lllc/CMakeLists.txt           | 2 ++
 mix/CMakeLists.txt            | 2 ++
 solc/CMakeLists.txt           | 2 ++
 test/CMakeLists.txt           | 6 ++++++
 third/CMakeLists.txt          | 2 ++
 8 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/alethzero/CMakeLists.txt b/alethzero/CMakeLists.txt
index b58446935..2cd6f43a4 100644
--- a/alethzero/CMakeLists.txt
+++ b/alethzero/CMakeLists.txt
@@ -32,6 +32,8 @@ eth_add_executable(${EXECUTABLE}
 
 add_dependencies(${EXECUTABLE} BuildInfo.h)
 
+target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARIES})
+target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES})
 target_link_libraries(${EXECUTABLE} Qt5::Core)
 target_link_libraries(${EXECUTABLE} webthree)
 target_link_libraries(${EXECUTABLE} qwebthree)
@@ -40,9 +42,6 @@ target_link_libraries(${EXECUTABLE} evm)
 target_link_libraries(${EXECUTABLE} ethcore)
 target_link_libraries(${EXECUTABLE} devcrypto)
 target_link_libraries(${EXECUTABLE} secp256k1)
-if (NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC"))
-target_link_libraries(${EXECUTABLE} serpent)
-endif()
 target_link_libraries(${EXECUTABLE} lll)
 target_link_libraries(${EXECUTABLE} solidity)
 target_link_libraries(${EXECUTABLE} evmcore)
@@ -51,6 +50,10 @@ target_link_libraries(${EXECUTABLE} web3jsonrpc)
 target_link_libraries(${EXECUTABLE} jsqrc)
 target_link_libraries(${EXECUTABLE} natspec)
 
+if (NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC"))
+	target_link_libraries(${EXECUTABLE} serpent)
+endif()
+
 # eth_install_executable is defined in cmake/EthExecutableHelper.cmake
 eth_install_executable(${EXECUTABLE})
 
diff --git a/eth/CMakeLists.txt b/eth/CMakeLists.txt
index c98f3cbec..bdd966bfc 100644
--- a/eth/CMakeLists.txt
+++ b/eth/CMakeLists.txt
@@ -17,6 +17,7 @@ add_dependencies(${EXECUTABLE} BuildInfo.h)
 
 target_link_libraries(${EXECUTABLE} ${Boost_REGEX_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES})
+target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARIES})
 
 if (READLINE_FOUND)
 	target_link_libraries(${EXECUTABLE} ${READLINE_LIBRARIES})
diff --git a/libweb3jsonrpc/CMakeLists.txt b/libweb3jsonrpc/CMakeLists.txt
index f371024e6..e4e71e885 100644
--- a/libweb3jsonrpc/CMakeLists.txt
+++ b/libweb3jsonrpc/CMakeLists.txt
@@ -30,7 +30,10 @@ target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_SERVER_LIBRARIES})
 target_link_libraries(${EXECUTABLE} webthree)
 target_link_libraries(${EXECUTABLE} secp256k1)
 target_link_libraries(${EXECUTABLE} solidity)
-target_link_libraries(${EXECUTABLE} serpent)
+
+if (NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC"))
+	target_link_libraries(${EXECUTABLE} serpent)
+endif()
 
 install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
diff --git a/lllc/CMakeLists.txt b/lllc/CMakeLists.txt
index 2e76aa6ff..f41584e04 100644
--- a/lllc/CMakeLists.txt
+++ b/lllc/CMakeLists.txt
@@ -13,6 +13,8 @@ add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
 add_dependencies(${EXECUTABLE} BuildInfo.h)
 
+target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES})
+target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARIES})
 target_link_libraries(${EXECUTABLE} lll)
 target_link_libraries(${EXECUTABLE} evmcore)
 target_link_libraries(${EXECUTABLE} devcore)
diff --git a/mix/CMakeLists.txt b/mix/CMakeLists.txt
index db9452061..235c41b92 100644
--- a/mix/CMakeLists.txt
+++ b/mix/CMakeLists.txt
@@ -34,6 +34,8 @@ eth_add_executable(${EXECUTABLE}
 	UI_RESOURCES ${UI_RESOURCES}
 )
 
+target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES})
+target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARIES})
 target_link_libraries(${EXECUTABLE} Qt5::Core)
 target_link_libraries(${EXECUTABLE} Qt5::Gui)
 target_link_libraries(${EXECUTABLE} Qt5::Widgets)
diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt
index 8c0ece27e..96129c499 100644
--- a/solc/CMakeLists.txt
+++ b/solc/CMakeLists.txt
@@ -13,6 +13,8 @@ add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
 target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${Boost_PROGRAM_OPTIONS_LIBRARIES})
+target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES})
+target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARIES})
 target_link_libraries(${EXECUTABLE} solidity)
 
 install( TARGETS ${EXECUTABLE} DESTINATION bin )
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 36876eea6..4d240a0ee 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -16,6 +16,8 @@ add_executable(createRandomTest createRandomTest.cpp vm.cpp TestHelper.cpp)
 add_executable(checkRandomTest checkRandomTest.cpp vm.cpp TestHelper.cpp)
 
 target_link_libraries(testeth ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
+target_link_libraries(testeth ${Boost_DATE_TIME_LIBRARIES})
+target_link_libraries(testeth ${Boost_CHRONO_LIBRARIES})
 target_link_libraries(testeth ${CURL_LIBRARIES})
 target_link_libraries(testeth ethereum)
 target_link_libraries(testeth ethcore)
@@ -30,9 +32,13 @@ if (JSONRPC)
 endif()
 
 target_link_libraries(createRandomTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
+target_link_libraries(createRandomTest ${Boost_DATE_TIME_LIBRARIES})
+target_link_libraries(createRandomTest ${Boost_CHRONO_LIBRARIES})
 target_link_libraries(createRandomTest ethereum)
 target_link_libraries(createRandomTest ethcore)
 target_link_libraries(checkRandomTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
+target_link_libraries(checkRandomTest ${Boost_DATE_TIME_LIBRARIES})
+target_link_libraries(checkRandomTest ${Boost_CHRONO_LIBRARIES})
 target_link_libraries(checkRandomTest ethereum)
 target_link_libraries(checkRandomTest ethcore)
 
diff --git a/third/CMakeLists.txt b/third/CMakeLists.txt
index 71f1e70f2..db72cdebd 100644
--- a/third/CMakeLists.txt
+++ b/third/CMakeLists.txt
@@ -31,6 +31,8 @@ eth_add_executable(${EXECUTABLE}
 
 add_dependencies(${EXECUTABLE} BuildInfo.h)
 
+target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES})
+target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARIES})
 target_link_libraries(${EXECUTABLE} Qt5::Core)
 target_link_libraries(${EXECUTABLE} webthree)
 target_link_libraries(${EXECUTABLE} qwebthree)

From 5ca7b3209f2ef9f8b24097502c45a0f533f06c47 Mon Sep 17 00:00:00 2001
From: debris <marek.kotewicz@gmail.com>
Date: Wed, 11 Feb 2015 11:41:56 +0100
Subject: [PATCH 3/3] fixed transitive dependencies for msvc

---
 alethzero/CMakeLists.txt  | 2 --
 eth/CMakeLists.txt        | 2 --
 libdevcore/CMakeLists.txt | 7 ++++++-
 lllc/CMakeLists.txt       | 2 --
 mix/CMakeLists.txt        | 2 --
 solc/CMakeLists.txt       | 2 --
 test/CMakeLists.txt       | 6 ------
 third/CMakeLists.txt      | 2 --
 8 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/alethzero/CMakeLists.txt b/alethzero/CMakeLists.txt
index 2cd6f43a4..8f355def7 100644
--- a/alethzero/CMakeLists.txt
+++ b/alethzero/CMakeLists.txt
@@ -32,8 +32,6 @@ eth_add_executable(${EXECUTABLE}
 
 add_dependencies(${EXECUTABLE} BuildInfo.h)
 
-target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARIES})
-target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES})
 target_link_libraries(${EXECUTABLE} Qt5::Core)
 target_link_libraries(${EXECUTABLE} webthree)
 target_link_libraries(${EXECUTABLE} qwebthree)
diff --git a/eth/CMakeLists.txt b/eth/CMakeLists.txt
index bdd966bfc..31aa8df96 100644
--- a/eth/CMakeLists.txt
+++ b/eth/CMakeLists.txt
@@ -16,8 +16,6 @@ add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 add_dependencies(${EXECUTABLE} BuildInfo.h)
 
 target_link_libraries(${EXECUTABLE} ${Boost_REGEX_LIBRARIES})
-target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES})
-target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARIES})
 
 if (READLINE_FOUND)
 	target_link_libraries(${EXECUTABLE} ${READLINE_LIBRARIES})
diff --git a/libdevcore/CMakeLists.txt b/libdevcore/CMakeLists.txt
index 51caee3d3..40aa7ce24 100644
--- a/libdevcore/CMakeLists.txt
+++ b/libdevcore/CMakeLists.txt
@@ -26,9 +26,14 @@ else()
 endif()
 
 target_link_libraries(${EXECUTABLE} ${Boost_THREAD_LIBRARIES})
-#target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARIES})
 
+# transitive dependencies for windows executables
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+	target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARIES})
+	target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES})
+endif()
+
 if (APPLE)
 	find_package(Threads REQUIRED)
 	target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT})
diff --git a/lllc/CMakeLists.txt b/lllc/CMakeLists.txt
index f41584e04..2e76aa6ff 100644
--- a/lllc/CMakeLists.txt
+++ b/lllc/CMakeLists.txt
@@ -13,8 +13,6 @@ add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
 add_dependencies(${EXECUTABLE} BuildInfo.h)
 
-target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES})
-target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARIES})
 target_link_libraries(${EXECUTABLE} lll)
 target_link_libraries(${EXECUTABLE} evmcore)
 target_link_libraries(${EXECUTABLE} devcore)
diff --git a/mix/CMakeLists.txt b/mix/CMakeLists.txt
index 235c41b92..db9452061 100644
--- a/mix/CMakeLists.txt
+++ b/mix/CMakeLists.txt
@@ -34,8 +34,6 @@ eth_add_executable(${EXECUTABLE}
 	UI_RESOURCES ${UI_RESOURCES}
 )
 
-target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES})
-target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARIES})
 target_link_libraries(${EXECUTABLE} Qt5::Core)
 target_link_libraries(${EXECUTABLE} Qt5::Gui)
 target_link_libraries(${EXECUTABLE} Qt5::Widgets)
diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt
index 96129c499..8c0ece27e 100644
--- a/solc/CMakeLists.txt
+++ b/solc/CMakeLists.txt
@@ -13,8 +13,6 @@ add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
 target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${Boost_PROGRAM_OPTIONS_LIBRARIES})
-target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES})
-target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARIES})
 target_link_libraries(${EXECUTABLE} solidity)
 
 install( TARGETS ${EXECUTABLE} DESTINATION bin )
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4d240a0ee..36876eea6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -16,8 +16,6 @@ add_executable(createRandomTest createRandomTest.cpp vm.cpp TestHelper.cpp)
 add_executable(checkRandomTest checkRandomTest.cpp vm.cpp TestHelper.cpp)
 
 target_link_libraries(testeth ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
-target_link_libraries(testeth ${Boost_DATE_TIME_LIBRARIES})
-target_link_libraries(testeth ${Boost_CHRONO_LIBRARIES})
 target_link_libraries(testeth ${CURL_LIBRARIES})
 target_link_libraries(testeth ethereum)
 target_link_libraries(testeth ethcore)
@@ -32,13 +30,9 @@ if (JSONRPC)
 endif()
 
 target_link_libraries(createRandomTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
-target_link_libraries(createRandomTest ${Boost_DATE_TIME_LIBRARIES})
-target_link_libraries(createRandomTest ${Boost_CHRONO_LIBRARIES})
 target_link_libraries(createRandomTest ethereum)
 target_link_libraries(createRandomTest ethcore)
 target_link_libraries(checkRandomTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
-target_link_libraries(checkRandomTest ${Boost_DATE_TIME_LIBRARIES})
-target_link_libraries(checkRandomTest ${Boost_CHRONO_LIBRARIES})
 target_link_libraries(checkRandomTest ethereum)
 target_link_libraries(checkRandomTest ethcore)
 
diff --git a/third/CMakeLists.txt b/third/CMakeLists.txt
index db72cdebd..71f1e70f2 100644
--- a/third/CMakeLists.txt
+++ b/third/CMakeLists.txt
@@ -31,8 +31,6 @@ eth_add_executable(${EXECUTABLE}
 
 add_dependencies(${EXECUTABLE} BuildInfo.h)
 
-target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES})
-target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARIES})
 target_link_libraries(${EXECUTABLE} Qt5::Core)
 target_link_libraries(${EXECUTABLE} webthree)
 target_link_libraries(${EXECUTABLE} qwebthree)