From 44de002f3fc2c88f228e25cf09e87a7165c63a4b Mon Sep 17 00:00:00 2001 From: debris Date: Tue, 9 Dec 2014 13:08:02 +0100 Subject: [PATCH] added curl libaries, which are required for testeth project --- cmake/EthDependencies.cmake | 6 ++++++ extdep/CMakeLists.txt | 1 + libp2p/Host.cpp | 2 +- test/CMakeLists.txt | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake index fb2aafd47..f957dd3ac 100644 --- a/cmake/EthDependencies.cmake +++ b/cmake/EthDependencies.cmake @@ -71,6 +71,12 @@ if (GMP_FOUND) message(" - gmp lib : ${GMP_LIBRARY}") endif() +# curl is only requried for tests +# TODO specify min curl version, on windows we are currenly using 7.29 +find_package (curl) +message(" - curl header: ${CURL_INCLUDE_DIR}") +message(" - curl lib : ${CURL_LIBRARY}") + # TODO make headless client optional find_package (QT5Core REQUIRED) find_package (QT5Gui REQUIRED) diff --git a/extdep/CMakeLists.txt b/extdep/CMakeLists.txt index cea32c80f..031093f56 100644 --- a/extdep/CMakeLists.txt +++ b/extdep/CMakeLists.txt @@ -44,6 +44,7 @@ else() eth_download(qt) eth_download(cryptopp) eth_download(boost) + eth_download(curl) endif() diff --git a/libp2p/Host.cpp b/libp2p/Host.cpp index 93a6ce672..52ceb5df3 100644 --- a/libp2p/Host.cpp +++ b/libp2p/Host.cpp @@ -42,7 +42,7 @@ Host::Host(std::string const& _clientVersion, NetworkPreferences const& _n, bool m_clientVersion(_clientVersion), m_netPrefs(_n), m_ifAddresses(Network::getInterfaceAddresses()), - m_ioService(2), + m_ioService(), m_acceptorV4(m_ioService), m_key(KeyPair::create()) { diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e27e0949d..3beb36643 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -18,6 +18,7 @@ target_link_libraries(testeth secp256k1) target_link_libraries(testeth solidity) target_link_libraries(testeth webthree) target_link_libraries(testeth ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE}) +target_link_libraries(testeth ${CURL_LIBRARY}) if (JSON_RPC_CPP_FOUND) target_link_libraries(testeth web3jsonrpc)