Move db_drivers/ to external/

Also change LMDB Cmake variables to CACHE rather than upgrading them
through several parent scopes.
This commit is contained in:
Thomas Winget 2015-03-17 18:55:24 -04:00
parent 56a1bf527b
commit 6e9e8ab620
No known key found for this signature in database
GPG Key ID: 58131A160789E630
59 changed files with 4 additions and 5 deletions

View File

@ -174,9 +174,6 @@ link_directories(${UNBOUND_LIBRARY_DIRS})
# Final setup for rapidjson
include_directories(external/rapidjson)
add_subdirectory(db_drivers)
# Final setup for liblmdb
include_directories(${LMDB_INCLUDE})

View File

@ -97,3 +97,5 @@ else()
die("Found libunbound includes, but could not find libunbound library. Please make sure you have installed libunbound or libunbound-dev or the equivalent")
endif()
endif()
add_subdirectory(db_drivers)

View File

@ -30,6 +30,6 @@
# critical a consensus component to rely on dynamically linked libraries
message(STATUS "Using ${ARCH_WIDTH}-bit LMDB from source tree")
add_subdirectory(liblmdb${ARCH_WIDTH})
set(LMDB_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/liblmdb${ARCH_WIDTH}" PARENT_SCOPE)
set(LMDB_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/liblmdb${ARCH_WIDTH}" CACHE STRING "LMDB Include path")
set(LMDB_LIBRARY "lmdb" PARENT_SCOPE)
set(LMDB_LIBRARY "lmdb" CACHE STRING "LMDB Library name")