Merge branch 'build_enhancement_debris' into build_enhancement

cmake/EthDependenciesDeprecated.cmake

@@ -3,6 +3,15 @@
 # deprecated. TODO will rewrite to proper CMake packages
 
 
+include(ExternalProject)
+
+ExternalProject_Add(project_cryptopp
+	URL http://www.cryptopp.com/cryptopp562.zip
+	BINARY_DIR project_cryptopp-prefix/src/project_cryptopp 
+	CONFIGURE_COMMAND ""
+	BUILD_COMMAND make -j 3
+	INSTALL_COMMAND ""
+)
 
 if("${TARGET_PLATFORM}" STREQUAL "w64")
 #	set(MINIUPNPC_LS /usr/x86_64-w64-mingw32/lib/libminiupnpc.a)
@@ -11,24 +20,10 @@ if("${TARGET_PLATFORM}" STREQUAL "w64")
 	set(CRYPTOPP_ID /usr/x86_64-w64-mingw32/include/cryptopp)
 else()
 	# Look for available Crypto++ version and if it is >= 5.6.2
-	find_path(ID cryptlib.h
-		../cryptopp/src
-		../../cryptopp/src
-		/usr/include/cryptopp
-		/usr/include/crypto++
-		/usr/local/include/cryptopp
-		/usr/local/include/crypto++
-		/opt/local/include/cryptopp
-		/opt/local/include/crypto++
-		)
-	find_library(LS NAMES cryptoppeth cryptopp
-		../cryptopp/src/../target/build/release
-		../../cryptopp/src/../target/build/release
-		PATHS
-		/usr/lib
-		/usr/local/lib
-		/opt/local/lib
-		)
+	
+	set(CRYPTOPP_ID ${CMAKE_CURRENT_BINARY_DIR}/project_cryptopp-prefix/src/project_cryptopp)
+	set(CRYPTOPP_LS cryptopp)
+	link_directories(${CMAKE_CURRENT_BINARY_DIR}/project_cryptopp-prefix/src/project_cryptopp)
 
 	if (ID AND LS)
 		message(STATUS "Found Crypto++: ${ID}, ${LS}")
@@ -180,9 +175,8 @@ else()
 	set(QTQML 1)
 endif()
 
-if(CRYPTOPP_ID)
-	include_directories(${CRYPTOPP_ID})
-endif()
+include_directories(${CRYPTOPP_ID})
+
 if(PYTHON_ID)
 	include_directories(${PYTHON_ID})
 endif()

extdep/CMakeLists.txt

@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.0)
+
+include(cryptopp.cmake)
+include(miniupnpc.cmake)
+

extdep/cryptopp.cmake

@@ -0,0 +1,11 @@
+include(ExternalProject)
+
+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 ""
+	)
+
+

extdep/miniupnpc.cmake

@@ -0,0 +1,11 @@
+include(ExternalProject)
+
+ExternalProject_Add(miniupnpc
+	URL http://miniupnp.tuxfamily.org/files/download.php?file=miniupnpc-1.9.20141027.tar.gz 
+	BINARY_DIR miniupnpc-prefix/src/miniupnpc
+	CONFIGURE_COMMAND ""
+	BUILD_COMMAND make -j 3
+	INSTALL_COMMAND ""
+	)
+
+

libdevcrypto/CMakeLists.txt

@@ -13,6 +13,7 @@ endif()
 
 include_directories(..)
 
+add_dependencies(${EXECUTABLE} project_cryptopp)
 target_link_libraries(${EXECUTABLE} devcore)
 target_link_libraries(${EXECUTABLE} secp256k1)
 target_link_libraries(${EXECUTABLE} gmp)