Browse Source

switched to a fork of json-rpc-cpp, roughly resembling v0.3.2. This fork

has already preliminary windows support
cl-refactor
sveneh 10 years ago
parent
commit
a66d369926
  1. 3
      extdep/CMakeLists.txt
  2. 14
      extdep/json-rpc-cpp.cmake

3
extdep/CMakeLists.txt

@ -9,7 +9,8 @@ set(ETH_DEPENDENCY_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/install/${SYSTEM_NAM
file(MAKE_DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR}) file(MAKE_DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR})
include(cryptopp.cmake) include(cryptopp.cmake)
include(curl.cmake) # will be re-eanbled later
# include(curl.cmake)
include(json-rpc-cpp.cmake) include(json-rpc-cpp.cmake)
#include(miniupnpc.cmake) #include(miniupnpc.cmake)

14
extdep/json-rpc-cpp.cmake

@ -1,21 +1,19 @@
# json-rpc-cpp is under heavy development, and multiplatform builds are not yet available. All the platforms currently need patches to make them work. # json-rpc-cpp is under heavy development, and multiplatform builds are not yet available.
# we use a forked repository which already has preliminary windows support
if(APPLE) if(APPLE)
set(PATCH_CMD patch -d src/example < ${CMAKE_CURRENT_SOURCE_DIR}/json-rpc-cpp_osx.patch)
set(CONFIG_CMD cmake -DCMAKE_INSTALL_PREFIX=${ETH_DEPENDENCY_INSTALL_DIR} -DCMAKE_MODULE_PATH:PATH=${CMAKE_CURRENT_SOURCE_DIR} -DETH_DEPENDENCY_INSTALL_DIR:PATH=${ETH_DEPENDENCY_INSTALL_DIR} -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST -Wno-dev .) set(CONFIG_CMD cmake -DCMAKE_INSTALL_PREFIX=${ETH_DEPENDENCY_INSTALL_DIR} -DCMAKE_MODULE_PATH:PATH=${CMAKE_CURRENT_SOURCE_DIR} -DETH_DEPENDENCY_INSTALL_DIR:PATH=${ETH_DEPENDENCY_INSTALL_DIR} -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST -Wno-dev .)
else() else()
set(PATCH_CMD patch --input=${CMAKE_CURRENT_SOURCE_DIR}/json-rpc-cpp_linux.patch --strip=1)
set(CONFIG_CMD cmake -DCMAKE_INSTALL_PREFIX=${ETH_DEPENDENCY_INSTALL_DIR} -DCMAKE_MODULE_PATH:PATH=${CMAKE_CURRENT_SOURCE_DIR} -DETH_DEPENDENCY_INSTALL_DIR:PATH=${ETH_DEPENDENCY_INSTALL_DIR} -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST .) set(CONFIG_CMD cmake -DCMAKE_INSTALL_PREFIX=${ETH_DEPENDENCY_INSTALL_DIR} -DCMAKE_MODULE_PATH:PATH=${CMAKE_CURRENT_SOURCE_DIR} -DETH_DEPENDENCY_INSTALL_DIR:PATH=${ETH_DEPENDENCY_INSTALL_DIR} -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST .)
endif() endif()
ExternalProject_Add(json-rpc-cpp ExternalProject_Add(json-rpc-cpp
DEPENDS curl # DEPENDS curl # re-enable later, when we build curl again
GIT_REPOSITORY https://github.com/cinemast/libjson-rpc-cpp.git GIT_REPOSITORY https://github.com/gogo40/libjson-rpc-cpp.git
GIT_TAG 0.2.1 GIT_TAG 27f5da7a70c7a82b0614982cac829d6fd5fc8314 # this is roughly verson 0.3.2
BINARY_DIR json-rpc-cpp-prefix/src/json-rpc-cpp BINARY_DIR json-rpc-cpp-prefix/src/json-rpc-cpp
PATCH_COMMAND ${PATCH_CMD}
CONFIGURE_COMMAND ${CONFIG_CMD} CONFIGURE_COMMAND ${CONFIG_CMD}
BUILD_COMMAND make jsonrpc -j 3 BUILD_COMMAND make -j 3
INSTALL_COMMAND make install INSTALL_COMMAND make install
) )

Loading…
Cancel
Save