Merge pull request #267

bed2331 Require BerkeleyDB to be installed (for now) if building non-static (Thomas Winget)
This commit is contained in:
Riccardo Spagni 2015-05-05 13:57:26 +02:00
commit 8b0d313d3e
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -37,13 +37,8 @@ set(LMDB_LIBRARY "lmdb" CACHE STRING "LMDB Library name")
if (NOT STATIC) if (NOT STATIC)
find_package(BerkeleyDB) find_package(BerkeleyDB)
if(NOT BERKELEY_DB_LIBRARIES OR STATIC) if(NOT BERKELEY_DB_LIBRARIES)
add_subdirectory(libdb) die("BerkeleyDB not found. At this time it should be installed in your system for a non-static build.")
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")
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)