monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 16:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #721

Browse source 
11de192 change to LMDB as default, even on 32-bit and ARM (Riccardo Spagni)
This commit is contained in:
Riccardo Spagni 2016-03-12 21:21:50 +02:00
commit 5843f89364
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 19 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
CMakeLists.txt
View file

@ -206,17 +206,13 @@ elseif()
endif() endif()
if (DATABASE STREQUAL "lmdb") if (DATABASE STREQUAL "lmdb")
message(STATUS "Using LMDB as default DB type")
set(BLOCKCHAIN_DB DB_LMDB) set(BLOCKCHAIN_DB DB_LMDB)
add_definitions("-DDEFAULT_DB_TYPE=\"lmdb\"")
# temporarily allow mingw to compile with berkeley_db, elseif (DATABASE STREQUAL "berkeleydb")
# regardless if building static or not
if(NOT STATIC OR MINGW)
find_package(BerkeleyDB) find_package(BerkeleyDB)
if(NOT BERKELEY_DB)
if(BERKELEY_DB_OVERRIDE AND NOT BERKELEY_DB) die("Found BerkeleyDB includes, but could not find BerkeleyDB library. Please make sure you have installed libdb and libdb-dev / libdb++-dev or the equivalent.")
message(STATUS "BERKELEY_DB setting has been overridden and disabled")
elseif(NOT BERKELEY_DB_LIBRARIES)
message(STATUS "BerkeleyDB not found and has been disabled.")
else() else()
message(STATUS "Found BerkeleyDB include (db.h) in ${BERKELEY_DB_INCLUDE_DIR}") message(STATUS "Found BerkeleyDB include (db.h) in ${BERKELEY_DB_INCLUDE_DIR}")
if(BERKELEY_DB_LIBRARIES) if(BERKELEY_DB_LIBRARIES)
@ -227,20 +223,15 @@ if (DATABASE STREQUAL "lmdb")
set(BDB_LIBRARY_DIRS "" CACHE STRING "BDB Library dirs") set(BDB_LIBRARY_DIRS "" CACHE STRING "BDB Library dirs")
set(BERKELEY_DB 1) set(BERKELEY_DB 1)
else() else()
message(STATUS "Found BerkeleyDB includes, but could not find BerkeleyDB library. Please make sure you have installed libdb and libdb-dev or the equivalent") die("Found BerkeleyDB includes, but could not find BerkeleyDB library. Please make sure you have installed libdb and libdb-dev / libdb++-dev or the equivalent.")
endif()
endif() endif()
endif() endif()
if (BERKELEY_DB AND (ARCH_WIDTH STREQUAL "32" OR ARM6 OR ARM7))
message(STATUS "Using Berkeley DB as default DB type") message(STATUS "Using Berkeley DB as default DB type")
add_definitions("-DDEFAULT_DB_TYPE=\"berkeley\"") add_definitions("-DDEFAULT_DB_TYPE=\"berkeley\"")
else()
message(STATUS "Using LMDB as default DB type")
add_definitions("-DDEFAULT_DB_TYPE=\"lmdb\"")
endif()
elseif (DATABASE STREQUAL "memory") elseif (DATABASE STREQUAL "memory")
set(BLOCKCHAIN_DB DB_MEMORY) set(BLOCKCHAIN_DB DB_MEMORY)
message(STATUS "Using Serialised In Memory as default DB type")
add_definitions("-DDEFAULT_DB_TYPE=\"memory\"") add_definitions("-DDEFAULT_DB_TYPE=\"memory\"")
else() else()
die("Invalid database type: ${DATABASE}") die("Invalid database type: ${DATABASE}")