mirror of
https://github.com/monero-project/monero.git
synced 2024-11-18 10:01:02 +00:00
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
parent
56a1bf527b
commit
6e9e8ab620
59 changed files with 4 additions and 5 deletions
|
|
@ -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})
|
||||
|
||||
|
|
|
|||
2
external/CMakeLists.txt
vendored
2
external/CMakeLists.txt
vendored
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
Loading…
Reference in a new issue