From 39f0fd1320a9b6c065113100b3a7875de937a6a0 Mon Sep 17 00:00:00 2001 From: sveneh Date: Thu, 20 Nov 2014 14:00:05 +0100 Subject: [PATCH] cleanup, Readme --- extdep/CMakeLists.txt | 4 ++-- extdep/Readme.md | 16 ++++++++++++++++ extdep/json-rpc-cpp_linux.patch | 13 ------------- extdep/json-rpc-cpp_osx.patch | 9 --------- 4 files changed, 18 insertions(+), 24 deletions(-) create mode 100644 extdep/Readme.md delete mode 100644 extdep/json-rpc-cpp_linux.patch delete mode 100644 extdep/json-rpc-cpp_osx.patch diff --git a/extdep/CMakeLists.txt b/extdep/CMakeLists.txt index d2245277f..5ef5e63d5 100644 --- a/extdep/CMakeLists.txt +++ b/extdep/CMakeLists.txt @@ -4,8 +4,8 @@ include(ExternalProject) # all dependencies will be installed into this directory, separated by platform -string(TOLOWER ${CMAKE_SYSTEM_NAME} SYSTEM_NAME) -set(ETH_DEPENDENCY_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/install/${SYSTEM_NAME}") +string(TOLOWER ${CMAKE_SYSTEM_NAME} _system_name) +set(ETH_DEPENDENCY_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/install/${_system_name}") file(MAKE_DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR}) include(cryptopp.cmake) diff --git a/extdep/Readme.md b/extdep/Readme.md new file mode 100644 index 000000000..1706f1fb9 --- /dev/null +++ b/extdep/Readme.md @@ -0,0 +1,16 @@ +# cpp-ethereum external dependencies + +**This is Work-in-Progress!** + +This directory hosts the external libraries that are needed to build cpp-ethereum. + +To automatically download, build, and link libraries, do +``` +cd extdep; mkdir build; cd build; cmake ..; make +``` +this will take some time. + + +To check which libraries are already included, check `CMakeLists.txt`. Other libraries still need to be fetched via the system's package manager. + +Libraries will be installed in `cpp-ethereum/extdep/install/` diff --git a/extdep/json-rpc-cpp_linux.patch b/extdep/json-rpc-cpp_linux.patch deleted file mode 100644 index 40662f2a8..000000000 --- a/extdep/json-rpc-cpp_linux.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/jsonrpc/CMakeLists.txt b/src/jsonrpc/CMakeLists.txt -index 79e8515..4e93eef 100644 ---- a/src/jsonrpc/CMakeLists.txt -+++ b/src/jsonrpc/CMakeLists.txt -@@ -12,7 +12,7 @@ set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}) - set_target_properties(jsonrpc jsonrpcStatic PROPERTIES VERSION "${VERSION_STRING}" SOVERSION "${VERSION_MAJOR}") - - --target_link_libraries(jsonrpc ${CURL_LIBRARIES}) -+target_link_libraries(jsonrpc ${CURL_LIBRARIES} dl pthread) - target_link_libraries(jsonrpcStatic ${CURL_LIBRARIES}) - - install(FILES ${jsonrpc_header} DESTINATION include/jsonrpc) diff --git a/extdep/json-rpc-cpp_osx.patch b/extdep/json-rpc-cpp_osx.patch deleted file mode 100644 index 39165530d..000000000 --- a/extdep/json-rpc-cpp_osx.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- ./src/example/CMakeLists.txt 2014-11-12 17:20:52.000000000 +0100 -+++ CMakeListsPatch.txt 2014-11-12 17:26:42.000000000 +0100 -@@ -12,6 +12,3 @@ - add_executable(stubserversample stubserver.cpp) - target_link_libraries(stubserversample jsonrpc) - -- --add_executable(xbmcremote xbmcremote.cpp) --target_link_libraries(xbmcremote jsonrpc)