aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2015-05-05 13:57:26 +0200
committerRiccardo Spagni <ric@spagni.net>2015-05-05 13:57:31 +0200
commit8b0d313d3e93110605911f34415c7cbf09b9024a (patch)
treef11ce189853343549b0c15e5286c7e84667ab362
parentMerge pull request #265 (diff)
parentRequire BerkeleyDB to be installed (for now) if building non-static (diff)
downloadmonero-8b0d313d3e93110605911f34415c7cbf09b9024a.tar.xz
Merge pull request #267
bed2331 Require BerkeleyDB to be installed (for now) if building non-static (Thomas Winget)
-rw-r--r--external/db_drivers/CMakeLists.txt9
1 files changed, 2 insertions, 7 deletions
diff --git a/external/db_drivers/CMakeLists.txt b/external/db_drivers/CMakeLists.txt
index 99b3a20bf..cd7479724 100644
--- a/external/db_drivers/CMakeLists.txt
+++ b/external/db_drivers/CMakeLists.txt
@@ -37,13 +37,8 @@ set(LMDB_LIBRARY "lmdb" CACHE STRING "LMDB Library name")
if (NOT STATIC)
find_package(BerkeleyDB)
- if(NOT BERKELEY_DB_LIBRARIES OR STATIC)
- add_subdirectory(libdb)
- message(STATUS "BerkeleyDB not found, building from src tree")
-
- set(BDB_STATIC true CACHE BOOL "BDB Static flag")
- set(BDB_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/libdb" CACHE STRING "BDB include path")
- set(BDB_LIBRARY "db" CACHE STRING "BDB library name")
+ if(NOT BERKELEY_DB_LIBRARIES)
+ die("BerkeleyDB not found. At this time it should be installed in your system for a non-static build.")
else()
message(STATUS "Found BerkeleyDB include (db.h) in ${BERKELEY_DB_INCLUDE_DIR}")
if(BERKELEY_DB_LIBRARIES)