Merge branch 'build_enhancement' of https://github.com/sveneh/cpp-ethereum into build_enhancement

Conflicts:
	cmake/EthDependencies.cmake
	extdep/CMakeLists.txt
	extdep/json-rpc-cpp.cmake

cmake/EthDependencies.cmake

@@ -7,25 +7,23 @@ string(TOLOWER ${CMAKE_SYSTEM_NAME} _system_name)
 set (CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/extdep/install/${_system_name}")
 
 
-# Dependencies must have a version number + EXACT, to ensure reproducible builds
+# Dependencies must have a version number, to ensure reproducible build. The version provided here is the one that is in the extdep repository. If you use system libraries, version numbers may be different.
 
 find_package (CryptoPP 5.6.2 EXACT REQUIRED)
 message(" - CryptoPP header: ${CRYPTOPP_INCLUDE_DIRS}")
 message(" - CryptoPP lib   : ${CRYPTOPP_LIBRARIES}")
 
-# TODO the Jsoncpp package does not yet check for correct version number
-
 find_package (LevelDB REQUIRED)
 message(" - LevelDB header: ${LEVELDB_INCLUDE_DIR}")
 message(" - LevelDB lib: ${LEVELDB_LIBRARY}")
 
 # TODO the Jsoncpp package does not yet check for correct version number
-find_package (Jsoncpp 0.60 EXACT REQUIRED)
+find_package (Jsoncpp 0.60 REQUIRED)
 message(" - Jsoncpp header: ${JSONCPP_INCLUDE_DIRS}")
 message(" - Jsoncpp lib   : ${JSONCPP_LIBRARIES}")
 
 # TODO the JsonRpcCpp package does not yet check for correct version number
-find_package (JsonRpcCpp 0.3.2 EXACT REQUIRED)
+find_package (JsonRpcCpp 0.3.2 REQUIRED)
 if (${JSON_RPC_CPP_FOUND})
     message (" - json-rpc-cpp header: ${JSON_RPC_CPP_INCLUDE_DIRS}")
     message (" - json-rpc-cpp lib   : ${JSON_RPC_CPP_LIBRARIES}")

extdep/CMakeLists.txt

@@ -18,4 +18,6 @@ include(leveldb.cmake)
 
 # will be re-eanbled later
 # include(miniupnpc.cmake)
+# include(curl.cmake)
 
+#include(miniupnpc.cmake)

extdep/json-rpc-cpp.cmake

@@ -2,7 +2,6 @@
 # DO NOT MESS WITH THESE SETTINGS! IF YOU HAVE TO MAKE CHANGES HERE, CONSULT sven@ethdev.com BEFOREHAND!!
 
 # DO NOT CHANGE ANYTHING HERE!
-
 if(APPLE)
 ExternalProject_Add(json-rpc-cpp
 	# DEPENDS argtable2 jsoncpp

test/CMakeLists.txt

@@ -19,7 +19,6 @@ target_link_libraries(testeth gmp)
 target_link_libraries(testeth solidity)
 target_link_libraries(testeth webthree)
 
-#TODO this on should not be necessary, it should have been brought in from ethcore dependency...
 target_link_libraries(testeth ${CRYPTOPP_LIBRARIES})
 
 if(JSON_RPC_CPP_FOUND)