full project compile with crypto++ dependency

CMakeLists.txt

@@ -42,16 +42,6 @@ function(configureProject)
 endfunction()
 
 
-# all dependencies that are not directly included in the cpp-ethereum distribution are defined here
-# for this to work, download the dependency via the cmake script in extdep or install them manually!
-function(checkExternalDependencies)
-	set(ETH_DEPENDENCY_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/extdep/install")
-
-	set (CRYPTOPP_ROOT_DIR ${ETH_DEPENDENCY_INSTALL_DIR}) 	
-	find_package (CryptoPP 5.6.2 REQUIRED)
-endfunction()
-
-
 
 function(createBuildInfo)
 	# Set build platform; to be written to BuildInfo.h
@@ -104,7 +94,10 @@ endif ()
 include(EthCompilerSettings)
 message("-- CXXFLAGS: ${CMAKE_CXX_FLAGS}")
 
-checkExternalDependencies()
+
+# this must be an include, as a function it would messs up with variable scope!
+include(EthDependencies)
+
 
 # TODO this will go away soon!
 include(EthDependenciesDeprecated)

alethzero/CMakeLists.txt

@@ -53,7 +53,7 @@ else ()
 endif ()
 
 qt5_use_modules(${EXECUTEABLE} Core)# Gui Widgets Network WebKit WebKitWidgets)
-target_link_libraries(${EXECUTEABLE} webthree qethereum ethereum evm ethcore devcrypto secp256k1 gmp ${CRYPTOPP_LS} serpent lll evmface devcore web3jsonrpc jsqrc)
+target_link_libraries(${EXECUTEABLE} webthree qethereum ethereum evm ethcore devcrypto secp256k1 gmp serpent lll evmface devcore web3jsonrpc jsqrc)
 
 if (APPLE)
 	# First have qt5 install plugins and frameworks

cmake/EthDependencies.cmake

@@ -0,0 +1,11 @@
+# all dependencies that are not directly included in the cpp-ethereum distribution are defined here
+# for this to work, download the dependency via the cmake script in extdep or install them manually!
+
+set(ETH_DEPENDENCY_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/extdep/install")
+
+set (CRYPTOPP_ROOT_DIR ${ETH_DEPENDENCY_INSTALL_DIR}) 	
+find_package (CryptoPP 5.6.2 REQUIRED)
+message("-- CryptoPP header: ${CRYPTOPP_INCLUDE_DIRS}")
+message("-- CryptoPP libs  : ${CRYPTOPP_LIBRARIES}")
+
+

cmake/EthDependenciesDeprecated.cmake

@@ -140,8 +140,6 @@ else()
 	set(QTQML 1)
 endif()
 
-include_directories(${CRYPTOPP_ID})
-
 if(PYTHON_ID)
 	include_directories(${PYTHON_ID})
 endif()

eth/CMakeLists.txt

@@ -16,7 +16,6 @@ if(MINIUPNPC_LS)
 	target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
-target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LS})
 if(JSONRPC_LS)
 target_link_libraries(${EXECUTABLE} web3jsonrpc)
 endif()

exp/CMakeLists.txt

@@ -11,7 +11,6 @@ add_executable(${EXECUTABLE} ${SRC_LIST})
 target_link_libraries(${EXECUTABLE} ethereum)
 target_link_libraries(${EXECUTABLE} p2p)
 target_link_libraries(${EXECUTABLE} gmp)
-target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LS})
 if(MINIUPNPC_LS)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()

iethxi/CMakeLists.txt

@@ -59,7 +59,7 @@ else ()
 endif ()
 
 qt5_use_modules(${EXECUTEABLE} Core Gui Widgets Network Quick Qml)
-target_link_libraries(${EXECUTEABLE} qethereum ethereum secp256k1 ${CRYPTOPP_LS})
+target_link_libraries(${EXECUTEABLE} qethereum ethereum secp256k1)
 
 if (APPLE)
 	if (${ADDFRAMEWORKS})

libdevcore/CMakeLists.txt

@@ -20,7 +20,6 @@ endif()
 include_directories(..)
 
 if("${TARGET_PLATFORM}" STREQUAL "w64")
-	include_directories(/usr/x86_64-w64-mingw32/include/cryptopp)
 	target_link_libraries(${EXECUTABLE} boost_system-mt-s)
 	target_link_libraries(${EXECUTABLE} boost_thread_win32-mt-s)
 	target_link_libraries(${EXECUTABLE} iphlpapi)

libethereum/CMakeLists.txt

@@ -26,7 +26,6 @@ if(MINIUPNPC_LS)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
-target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LS})
 target_link_libraries(${EXECUTABLE} gmp)
 
 if("${TARGET_PLATFORM}" STREQUAL "w64")

libevm/CMakeLists.txt

@@ -25,7 +25,6 @@ if(MINIUPNPC_LS)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
-target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LS})
 
 if("${TARGET_PLATFORM}" STREQUAL "w64")
 	target_link_libraries(${EXECUTABLE} boost_system-mt-s)

libp2p/CMakeLists.txt

@@ -22,7 +22,6 @@ if(MINIUPNPC_LS)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
-target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LS})
 target_link_libraries(${EXECUTABLE} gmp)
 
 if("${TARGET_PLATFORM}" STREQUAL "w64")

libqethereum/CMakeLists.txt

@@ -59,7 +59,7 @@ endif()
 
 include_directories(/)
 qt5_use_modules(${EXECUTABLE} Core Gui WebKit WebKitWidgets Widgets Network Quick Qml)
-target_link_libraries(${EXECUTABLE} ethereum secp256k1 ${CRYPTOPP_LS} ${JSONRPC_LS})
+target_link_libraries(${EXECUTABLE} ethereum secp256k1 ${JSONRPC_LS})
 
 if (APPLE)
 	if (${ADDFRAMEWORKS})

libwebthree/CMakeLists.txt

@@ -27,7 +27,6 @@ if(MINIUPNPC_LS)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
-target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LS})
 target_link_libraries(${EXECUTABLE} gmp)
 
 if("${TARGET_PLATFORM}" STREQUAL "w64")

libwhisper/CMakeLists.txt

@@ -24,7 +24,6 @@ if(MINIUPNPC_LS)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
-target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LS})
 target_link_libraries(${EXECUTABLE} gmp)
 
 if("${TARGET_PLATFORM}" STREQUAL "w64")

neth/CMakeLists.txt

@@ -17,7 +17,6 @@ if(MINIUPNPC_LS)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
-target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LS})
 if(JSONRPC_LS)
 target_link_libraries(${EXECUTABLE} web3jsonrpc)
 endif()

test/CMakeLists.txt

@@ -4,18 +4,23 @@ aux_source_directory(. SRC_LIST)
 list(REMOVE_ITEM SRC_LIST "./createRandomTest.cpp")
 
 include_directories(..)
+include_directories(${CRYPTOPP_INCLUDE_DIR})
 
 file(GLOB HEADERS "*.h")
 add_executable(testeth ${SRC_LIST} ${HEADERS})
 add_executable(createRandomTest createRandomTest.cpp vm.cpp)
 
+
 target_link_libraries(testeth ethereum)
 target_link_libraries(testeth ethcore)
 target_link_libraries(testeth secp256k1)
 target_link_libraries(testeth gmp)
 target_link_libraries(testeth solidity)
-target_link_libraries(testeth ${CRYPTOPP_LIBRARIES})
 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(JSONRPC_LS)
 	target_link_libraries(testeth web3jsonrpc)
 endif()
@@ -24,6 +29,7 @@ target_link_libraries(createRandomTest ethereum)
 target_link_libraries(createRandomTest ethcore)
 target_link_libraries(createRandomTest boost_chrono)
 target_link_libraries(createRandomTest boost_unit_test_framework)
+target_link_libraries(createRandomTest ${CRYPTOPP_LIBRARIES})
 
 if ("${TARGET_PLATFORM}" STREQUAL "w64")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")

third/CMakeLists.txt

@@ -53,7 +53,7 @@ else ()
 endif ()
 
 qt5_use_modules(${EXECUTEABLE} Core)# Gui Widgets Network WebKit WebKitWidgets)
-target_link_libraries(${EXECUTEABLE} webthree qethereum ethereum evm ethcore secp256k1 gmp ${CRYPTOPP_LS} serpent lll evmface devcore web3jsonrpc jsqrc)
+target_link_libraries(${EXECUTEABLE} webthree qethereum ethereum evm ethcore secp256k1 gmp serpent lll evmface devcore web3jsonrpc jsqrc)
 
 if (APPLE)
 	# First have qt5 install plugins and frameworks

walleth/CMakeLists.txt

@@ -59,7 +59,7 @@ else ()
 endif ()
 
 qt5_use_modules(${EXECUTEABLE} Core Gui Widgets Network Quick Qml)
-target_link_libraries(${EXECUTEABLE} qethereum ethereum secp256k1 ${CRYPTOPP_LS})
+target_link_libraries(${EXECUTEABLE} qethereum ethereum secp256k1)
 
 if (APPLE)
 	if (${ADDFRAMEWORKS})