diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-02-08 18:31:06 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-02-08 18:31:06 +0200 |
| commit | 18b12cd24f4bbdf08e4612a2038ff88f93deaf02 (patch) | |
| tree | 0a18f898252d49cc768315a892397dc27120ab11 | |
| parent | Merge pull request #639 (diff) | |
| parent | Add make option to disable BerkeleyDB (diff) | |
| download | monero-18b12cd24f4bbdf08e4612a2038ff88f93deaf02.tar.xz | |
Merge pull request #640
3d1e690 Add make option to disable BerkeleyDB (warptangent)
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c032bbee0..ff4f88536 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,7 +197,14 @@ else() message(STATUS "Could not find DATABASE in env (not required unless you want to change database type from default: ${DATABASE})") endif() -set(BERKELEY_DB 0) +set(BERKELEY_DB_OVERRIDE 0) +if (DEFINED ENV{BERKELEY_DB}) + set(BERKELEY_DB_OVERRIDE 1) + set(BERKELEY_DB $ENV{BERKELEY_DB}) +elseif() + set(BERKELEY_DB 0) +endif() + if (DATABASE STREQUAL "lmdb") set(BLOCKCHAIN_DB DB_LMDB) @@ -206,7 +213,9 @@ if (DATABASE STREQUAL "lmdb") if(NOT STATIC OR MINGW) find_package(BerkeleyDB) - if(NOT BERKELEY_DB_LIBRARIES) + if(BERKELEY_DB_OVERRIDE AND NOT BERKELEY_DB) + 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() message(STATUS "Found BerkeleyDB include (db.h) in ${BERKELEY_DB_INCLUDE_DIR}") |