Browse Source

added curl libaries, which are required for testeth project

cl-refactor
debris 10 years ago
parent
commit
44de002f3f
  1. 6
      cmake/EthDependencies.cmake
  2. 1
      extdep/CMakeLists.txt
  3. 2
      libp2p/Host.cpp
  4. 1
      test/CMakeLists.txt

6
cmake/EthDependencies.cmake

@ -71,6 +71,12 @@ if (GMP_FOUND)
message(" - gmp lib : ${GMP_LIBRARY}") message(" - gmp lib : ${GMP_LIBRARY}")
endif() 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 # TODO make headless client optional
find_package (QT5Core REQUIRED) find_package (QT5Core REQUIRED)
find_package (QT5Gui REQUIRED) find_package (QT5Gui REQUIRED)

1
extdep/CMakeLists.txt

@ -44,6 +44,7 @@ else()
eth_download(qt) eth_download(qt)
eth_download(cryptopp) eth_download(cryptopp)
eth_download(boost) eth_download(boost)
eth_download(curl)
endif() endif()

2
libp2p/Host.cpp

@ -42,7 +42,7 @@ Host::Host(std::string const& _clientVersion, NetworkPreferences const& _n, bool
m_clientVersion(_clientVersion), m_clientVersion(_clientVersion),
m_netPrefs(_n), m_netPrefs(_n),
m_ifAddresses(Network::getInterfaceAddresses()), m_ifAddresses(Network::getInterfaceAddresses()),
m_ioService(2), m_ioService(),
m_acceptorV4(m_ioService), m_acceptorV4(m_ioService),
m_key(KeyPair::create()) m_key(KeyPair::create())
{ {

1
test/CMakeLists.txt

@ -18,6 +18,7 @@ target_link_libraries(testeth secp256k1)
target_link_libraries(testeth solidity) target_link_libraries(testeth solidity)
target_link_libraries(testeth webthree) target_link_libraries(testeth webthree)
target_link_libraries(testeth ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE}) target_link_libraries(testeth ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE})
target_link_libraries(testeth ${CURL_LIBRARY})
if (JSON_RPC_CPP_FOUND) if (JSON_RPC_CPP_FOUND)
target_link_libraries(testeth web3jsonrpc) target_link_libraries(testeth web3jsonrpc)

Loading…
Cancel
Save