From bed23319040776dc34e11a022a5ee2ff470df208 Mon Sep 17 00:00:00 2001 From: Thomas Winget Date: Wed, 22 Apr 2015 01:51:14 -0400 Subject: [PATCH] Require BerkeleyDB to be installed (for now) if building non-static --- external/db_drivers/CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/external/db_drivers/CMakeLists.txt b/external/db_drivers/CMakeLists.txt index 99b3a20b..cd747972 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)