aboutsummaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorThomas Winget <tewinget@gmail.com>2015-03-16 09:14:51 -0400
committerThomas Winget <tewinget@gmail.com>2015-03-16 09:14:51 -0400
commit43477b7dac861a83ade364ebb5a5c3da8228b3e4 (patch)
tree8ac746edc7275924353fc8ffbe1556d615b2ccfe /external
parentCMake wiring, minor cleanup, minor test addition (diff)
downloadmonero-43477b7dac861a83ade364ebb5a5c3da8228b3e4.tar.xz
BerkeleyDB Blockchain building, not working yet
Everything except actually *using* BlockchainBDB is wired up, but the db itself is not yet working. Some error about user mem not large enough. I think I know what this error means, but I can't determine the cause. Notes: BerkeleyDB does not allow 0-indexing in its recno type databases, so block numbers *in the database* will be 1-indexed. Modifications to indexing have been made as needed.
Diffstat (limited to 'external')
-rw-r--r--external/db_drivers/CMakeLists.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/external/db_drivers/CMakeLists.txt b/external/db_drivers/CMakeLists.txt
index 0498eaaf2..f90f9f136 100644
--- a/external/db_drivers/CMakeLists.txt
+++ b/external/db_drivers/CMakeLists.txt
@@ -50,7 +50,7 @@ endif()
find_package(BerkeleyDB)
-if(NOT DB_LIBRARIES OR STATIC)
+if(NOT BERKELEY_DB_LIBRARIES OR STATIC)
add_subdirectory(libdb)
message(STATUS "BerkeleyDB not found, building from src tree")
@@ -58,12 +58,12 @@ if(NOT DB_LIBRARIES OR STATIC)
set(BDB_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/libdb" PARENT_SCOPE)
set(BDB_LIBRARY "db" PARENT_SCOPE)
else()
- message(STATUS "Found BerkeleyDB include (db.h) in ${DB_INCLUDE_DIR}")
- if(DB_LIBRARIES)
+ message(STATUS "Found BerkeleyDB include (db.h) in ${BERKELEY_DB_INCLUDE_DIR}")
+ if(BERKELEY_DB_LIBRARIES)
message(STATUS "Found BerkeleyDB shared library")
set(BDB_STATIC false PARENT_SCOPE)
- set(BDB_INCLUDE ${DB_INCLUDE_DIR} PARENT_SCOPE)
- set(BDB_LIBRARY ${DB_LIBRARIES} PARENT_SCOPE)
+ set(BDB_INCLUDE ${BERKELEY_DB_INCLUDE_DIR} PARENT_SCOPE)
+ set(BDB_LIBRARY ${BERKELEY_DB_LIBRARIES} PARENT_SCOPE)
set(BDB_LIBRARY_DIRS "" PARENT_SCOPE)
else()
die("Found BerkeleyDB includes, but could not find BerkeleyDB library. Please make sure you have installed libdb and libdb-dev or the equivalent")