Merge pull request #267

bed2331 Require BerkeleyDB to be installed (for now) if building non-static (Thomas Winget)
monero-project · May 5, 2015 · 8b0d313 · 8b0d313
2 parents b63e841 + bed2331
commit 8b0d313
Showing 1 changed file with 2 additions and 7 deletions.
diff --git 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)