From 01167d1b354fe26da5eafed510975b811005ac49 Mon Sep 17 00:00:00 2001 From: debris Date: Wed, 26 Nov 2014 15:42:36 +0100 Subject: [PATCH] argtable && jsoncpp msbuild --- extdep/CMakeLists.txt | 4 +++- extdep/argtable2.cmake | 12 ++++++++++++ extdep/jsoncpp.cmake | 15 +++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 extdep/argtable2.cmake create mode 100644 extdep/jsoncpp.cmake diff --git a/extdep/CMakeLists.txt b/extdep/CMakeLists.txt index 7551d2e98..4871d5486 100644 --- a/extdep/CMakeLists.txt +++ b/extdep/CMakeLists.txt @@ -9,7 +9,9 @@ set(ETH_DEPENDENCY_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/install/${_system_na file(MAKE_DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR}/lib) file(MAKE_DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR}/include) -include(cryptopp.cmake) +include(jsoncpp.cmake) +#include(argtable2.cmake) +#include(cryptopp.cmake) # will be re-eanbled later # include(curl.cmake) #include(json-rpc-cpp.cmake) diff --git a/extdep/argtable2.cmake b/extdep/argtable2.cmake new file mode 100644 index 000000000..3da2f7534 --- /dev/null +++ b/extdep/argtable2.cmake @@ -0,0 +1,12 @@ +if(APPLE) + +elseif(WIN32) +ExternalProject_Add(argtable2 + URL http://sourceforge.net/projects/argtable/files/argtable/argtable-2.13/argtable2-13.tar.gz + BINARY_DIR argtable2-prefix/src/argtable2 + CONFIGURE_COMMAND cmake . + BUILD_COMMAND devenv argtable2.sln /build release + INSTALL_COMMAND cmd /c cp src/Release/argtable2.lib ${ETH_DEPENDENCY_INSTALL_DIR}/lib && cp src/argtable2.h ${ETH_DEPENDENCY_INSTALL_DIR}/include +) +else() +endif() diff --git a/extdep/jsoncpp.cmake b/extdep/jsoncpp.cmake new file mode 100644 index 000000000..b3bdef5e2 --- /dev/null +++ b/extdep/jsoncpp.cmake @@ -0,0 +1,15 @@ +if(APPLE) + +elseif(WIN32) + +file(MAKE_DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR}/include/jsoncpp) +ExternalProject_Add(jsoncpp + GIT_REPOSITORY https://github.com/open-source-parsers/jsoncpp + GIT_TAG svn-import + BINARY_DIR jsoncpp-prefix/src/jsoncpp + CONFIGURE_COMMAND cmake . + BUILD_COMMAND devenv jsoncpp.sln /build release + INSTALL_COMMAND cmd /c cp lib/Release/jsoncpp.lib ${ETH_DEPENDENCY_INSTALL_DIR}/lib && cp -R include/json ${ETH_DEPENDENCY_INSTALL_DIR}/include/jsoncpp +) +else() +endif()