leveldb downloaded locally

cmake/EthDependenciesDeprecated.cmake

@@ -5,34 +5,8 @@
 
 if("${TARGET_PLATFORM}" STREQUAL "w64")
 #	set(MINIUPNPC_LS /usr/x86_64-w64-mingw32/lib/libminiupnpc.a)
-	set(LEVELDB_LS leveldb)
 else()
 
-	find_path( LEVELDB_ID leveldb/db.h
-		/usr/include
-		/usr/local/include
-		)
-	if ( LEVELDB_ID STREQUAL "LEVELDB_ID-NOTFOUND" )
-		message(FATAL_ERROR "Failed to find the LevelDB headers")
-	else ()
-		message(STATUS "Found LevelDB Headers")
-
-		# Check for accessory dev libraries leveldb and miniupnpc
-		find_library( LEVELDB_LS NAMES leveldb
-			PATHS
-			/usr/lib
-			/usr/local/lib
-			/opt/local/lib
-			/usr/lib/*/
-			)
-		if ( LEVELDB_LS STREQUAL "LEVELDB_LS-NOTFOUND" )
-			message(FATAL_ERROR "Failed to find the LevelDB Library!")
-		else ()
-			message(STATUS "Found LevelDB Library: ${LEVELDB_LS}")
-			add_definitions(-DETH_LEVELDB)
-		endif ()
-	endif ()
-
 	find_path( PYTHON_ID pyconfig.h
 		${PYTHON_INCLUDE_DIR}
 		/usr/include/python2.7
@@ -123,9 +97,6 @@ endif()
 if(MINIUPNPC_ID)
 	include_directories(${MINIUPNPC_ID})
 endif()
-if(LEVELDB_ID)
-	include_directories(${LEVELDB_ID})
-endif()
 if(READLINE_ID)
 	include_directories(${READLINE_ID})
 endif()

cmake/FindLevelDB.cmake

@@ -13,14 +13,14 @@
 find_path(
     LEVELDB_INCLUDE_DIR 
     NAMES leveldb/db.h
-    DOC "leveldb include dir"
+	DOC "leveldb include dir"
-)
+	)
 
 find_library(
     LEVELDB_LIBRARY
     NAMES leveldb
     DOC "leveldb library"
-)
+	)
 
 # message (" - leveldb header : ${LEVELDB_INCLUDE_DIR}")
 # message (" - leveldb lib    : ${LEVELDB_LIBRARY}")

eth/CMakeLists.txt

@@ -4,6 +4,7 @@ aux_source_directory(. SRC_LIST)
 
 include_directories(..)
 include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
+include_directories(${LEVELDB_INCLUDE_DIR})
 
 set(EXECUTABLE eth)
 
@@ -16,7 +17,7 @@ target_link_libraries(${EXECUTABLE} gmp)
 if(MINIUPNPC_LS)
 	target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
+target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
 if(JSON_RPC_CPP_FOUND)
     target_link_libraries(${EXECUTABLE} web3jsonrpc)
 endif()

exp/CMakeLists.txt

@@ -3,6 +3,7 @@ cmake_policy(SET CMP0015 NEW)
 aux_source_directory(. SRC_LIST)
 
 include_directories(..)
+include_directories(${LEVELDB_INCLUDE_DIR})
 
 set(EXECUTABLE exp)
 
@@ -14,7 +15,7 @@ target_link_libraries(${EXECUTABLE} gmp)
 if(MINIUPNPC_LS)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
+target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
 
 if ("${TARGET_PLATFORM}" STREQUAL "w64")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")

libdevcore/CMakeLists.txt

@@ -7,6 +7,8 @@ endif()
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
 
 aux_source_directory(. SRC_LIST)
+include_directories(..)
+include_directories(${LEVELDB_INCLUDE_DIR})
 
 set(EXECUTABLE devcore)
 
@@ -17,8 +19,6 @@ else()
 	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
-include_directories(..)
-
 if("${TARGET_PLATFORM}" STREQUAL "w64")
 	target_link_libraries(${EXECUTABLE} boost_system-mt-s)
 	target_link_libraries(${EXECUTABLE} boost_thread_win32-mt-s)

libdevcrypto/CMakeLists.txt

@@ -13,11 +13,12 @@ endif()
 
 include_directories(..) 
 include_directories(${CRYPTOPP_INCLUDE_DIR})
+include_directories(${LEVELDB_INCLUDE_DIR})
 
 target_link_libraries(${EXECUTABLE} devcore)
 target_link_libraries(${EXECUTABLE} secp256k1)
 target_link_libraries(${EXECUTABLE} gmp)
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
+target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
 target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LIBRARIES})
 
 if("${TARGET_PLATFORM}" STREQUAL "w64")

libethcore/CMakeLists.txt

@@ -1,6 +1,9 @@
 cmake_policy(SET CMP0015 NEW)
 
 aux_source_directory(. SRC_LIST)
+include_directories(..)
+include_directories(${CRYPTOPP_INCLUDE_DIR})
+include_directories(${LEVELDB_INCLUDE_DIR})
 
 set(EXECUTABLE ethcore)
 
@@ -11,14 +14,11 @@ else()
 	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
-include_directories(..)
-include_directories(${CRYPTOPP_INCLUDE_DIR})
-
 target_link_libraries(${EXECUTABLE} devcrypto)
 target_link_libraries(${EXECUTABLE} devcore)
 target_link_libraries(${EXECUTABLE} secp256k1)
 target_link_libraries(${EXECUTABLE} gmp)
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
+target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
 
 if("${TARGET_PLATFORM}" STREQUAL "w64")
 	target_link_libraries(${EXECUTABLE} boost_system-mt-s)

libethereum/CMakeLists.txt

@@ -14,6 +14,7 @@ else()
 endif()
 
 include_directories(..)
+include_directories(${LEVELDB_INCLUDE_DIR})
 
 target_link_libraries(${EXECUTABLE} evm)
 target_link_libraries(${EXECUTABLE} lll)
@@ -25,7 +26,7 @@ target_link_libraries(${EXECUTABLE} secp256k1)
 if(MINIUPNPC_LS)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
+target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
 target_link_libraries(${EXECUTABLE} gmp)
 
 if("${TARGET_PLATFORM}" STREQUAL "w64")

libevm/CMakeLists.txt

@@ -14,6 +14,7 @@ else()
 endif()
 
 include_directories(..)
+include_directories(${LEVELDB_INCLUDE_DIR})
 
 target_link_libraries(${EXECUTABLE} ethcore)
 target_link_libraries(${EXECUTABLE} devcrypto)
@@ -24,7 +25,7 @@ target_link_libraries(${EXECUTABLE} gmp)
 if(MINIUPNPC_LS)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
+target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
 
 if("${TARGET_PLATFORM}" STREQUAL "w64")
 	target_link_libraries(${EXECUTABLE} boost_system-mt-s)

libp2p/CMakeLists.txt

@@ -14,6 +14,7 @@ else()
 endif()
 
 include_directories(..)
+include_directories(${LEVELDB_INCLUDE_DIR})
 
 target_link_libraries(${EXECUTABLE} devcrypto)
 target_link_libraries(${EXECUTABLE} devcore)
@@ -21,7 +22,7 @@ target_link_libraries(${EXECUTABLE} secp256k1)
 if(MINIUPNPC_LS)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
+target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
 target_link_libraries(${EXECUTABLE} gmp)
 
 if("${TARGET_PLATFORM}" STREQUAL "w64")

libweb3jsonrpc/CMakeLists.txt

@@ -4,6 +4,7 @@ aux_source_directory(. SRC_LIST)
 
 include_directories(..)
 include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
+include_directories(${LEVELDB_INCLUDE_DIR})
 link_directories(../libethcore)
 link_directories(../libwebthree)
 
@@ -24,7 +25,7 @@ target_link_libraries(${EXECUTABLE} serpent)
 if(MINIUPNPC_LS)
 	target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
+target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
 target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_LIBRARIES})
 if(READLINE_LS)

libwebthree/CMakeLists.txt

@@ -14,6 +14,7 @@ else()
 endif()
 
 include_directories(..)
+include_directories(${LEVELDB_INCLUDE_DIR})
 
 target_link_libraries(${EXECUTABLE} ethereum)
 target_link_libraries(${EXECUTABLE} evm)
@@ -26,7 +27,7 @@ target_link_libraries(${EXECUTABLE} secp256k1)
 if(MINIUPNPC_LS)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
+target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
 target_link_libraries(${EXECUTABLE} gmp)
 
 if("${TARGET_PLATFORM}" STREQUAL "w64")

libwhisper/CMakeLists.txt

@@ -4,6 +4,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
 
 aux_source_directory(. SRC_LIST)
 
+include_directories(..)
+include_directories(${LEVELDB_INCLUDE_DIR})
+
 set(EXECUTABLE whisper)
 
 file(GLOB HEADERS "*.h")
@@ -13,8 +16,6 @@ else()
 	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
-include_directories(..)
-
 target_link_libraries(${EXECUTABLE} ethcore)
 target_link_libraries(${EXECUTABLE} devcrypto)
 target_link_libraries(${EXECUTABLE} devcore)
@@ -23,7 +24,7 @@ target_link_libraries(${EXECUTABLE} secp256k1)
 if(MINIUPNPC_LS)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
+target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
 target_link_libraries(${EXECUTABLE} gmp)
 
 if("${TARGET_PLATFORM}" STREQUAL "w64")

neth/CMakeLists.txt

@@ -3,8 +3,8 @@ cmake_policy(SET CMP0015 NEW)
 aux_source_directory(. SRC_LIST)
 
 include_directories(..)
-include_directories(${LEVELDB_ID})
 include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
+include_directories(${LEVELDB_INCLUDE_DIR})
 
 set(EXECUTABLE neth)
 
@@ -17,7 +17,7 @@ target_link_libraries(${EXECUTABLE} gmp)
 if(MINIUPNPC_LS)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 endif()
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
+target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
 if(JSON_RPC_CPP_FOUND)
     target_link_libraries(${EXECUTABLE} web3jsonrpc)
 endif()