Merge branch 'debris_sven_build' into build_enhancement

extdep/CMakeLists.txt

@@ -5,7 +5,10 @@ include(ExternalProject)
 # dependencies will be installed into this directory
 set(ETH_DEPENDENCY_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/install")
 
+file(MAKE_DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR})
 
 include(cryptopp.cmake)
-#include(miniupnpc.cmake)
+include(curl.cmake)
+include(json-rpc-cpp.cmake)
+include(miniupnpc.cmake)
 

extdep/FindCURL.cmake

@@ -0,0 +1,9 @@
+# hacky way to resolve nested dependencies
+find_library(CURL_LIBRARY NAMES curl
+	PATHS
+	${ETH_DEPENDENCY_INSTALL_DIR}/lib
+	)
+
+set(CURL_LIBRARIES ${CURL_LIBRARY})
+set(CURL_INCLUDE_DIRS ${ETH_DEPENDENCY_INSTALL_DIR}/include)
+

extdep/cryptopp.cmake

@@ -1,11 +1,18 @@
-ExternalProject_Add(
-	cryptopp
+if(${APPLE})
+ExternalProject_Add(cryptopp
+	URL http://www.cryptopp.com/cryptopp562.zip
+	BINARY_DIR cryptopp-prefix/src/cryptopp
+	CONFIGURE_COMMAND ""
+	BUILD_COMMAND make -j 3
+	INSTALL_COMMAND make dynamic install PREFIX=${ETH_DEPENDENCY_INSTALL_DIR}
+	)
+else()
+ExternalProject_Add(cryptopp
 	URL https://github.com/mmoss/cryptopp/archive/v5.6.2.zip
 	BINARY_DIR cryptopp-prefix/src/cryptopp
 	CONFIGURE_COMMAND ""
 	BUILD_COMMAND scons --shared --prefix=${ETH_DEPENDENCY_INSTALL_DIR}
 	INSTALL_COMMAND ""
 )
-
-
+endif()
 	

extdep/curl.cmake

@@ -0,0 +1,12 @@
+if(${APPLE})
+ExternalProject_Add(curl
+	URL http://curl.haxx.se/download/curl-7.38.0.tar.bz2 
+	BINARY_DIR curl-prefix/src/curl
+	CONFIGURE_COMMAND ./configure --with-darwinssl --prefix=${ETH_DEPENDENCY_INSTALL_DIR} --exec-prefix=${ETH_DEPENDENCY_INSTALL_DIR}
+	BUILD_COMMAND make -j 3
+	INSTALL_COMMAND make install
+	)
+else()
+
+endif()
+

extdep/json-rpc-cpp.cmake

@@ -0,0 +1,11 @@
+ExternalProject_Add(json-rpc-cpp
+	DEPENDS curl
+	GIT_REPOSITORY https://github.com/cinemast/libjson-rpc-cpp.git 
+	GIT_TAG eaca2481e2889d5a5b748383fb02b1d395969cd4
+	BINARY_DIR json-rpc-cpp-prefix/src/json-rpc-cpp
+	CONFIGURE_COMMAND 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 .
+	BUILD_COMMAND make jsonrpc -j 3
+	INSTALL_COMMAND make install
+	)
+
+

extdep/miniupnpc.cmake

@@ -5,7 +5,7 @@ ExternalProject_Add(miniupnpc
 	BINARY_DIR miniupnpc-prefix/src/miniupnpc
 	CONFIGURE_COMMAND ""
 	BUILD_COMMAND make -j 3
-	INSTALL_COMMAND ""
+	INSTALL_COMMAND make install INSTALLPREFIX=${ETH_DEPENDENCY_INSTALL_DIR}
 	)