Move db_drivers/ to external/

Also change LMDB Cmake variables to CACHE rather than upgrading them through several parent scopes.
monero-project · Mar 17, 2015 · 6e9e8ab · 6e9e8ab
1 parent 56a1bf5
commit 6e9e8ab
Show file tree

Hide file tree

Showing 59 changed files with 4 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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})
 

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -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)
diff --git a/db_drivers/CMakeLists.txt → external/db_drivers/CMakeLists.txt b/db_drivers/CMakeLists.txt → external/db_drivers/CMakeLists.txt
@@ -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")
diff --git a/db_drivers/liblmdb32/.gitignore → external/db_drivers/liblmdb32/.gitignore b/db_drivers/liblmdb32/.gitignore → external/db_drivers/liblmdb32/.gitignore
diff --git a/db_drivers/liblmdb32/CHANGES → external/db_drivers/liblmdb32/CHANGES b/db_drivers/liblmdb32/CHANGES → external/db_drivers/liblmdb32/CHANGES
diff --git a/db_drivers/liblmdb32/CMakeLists.txt → external/db_drivers/liblmdb32/CMakeLists.txt b/db_drivers/liblmdb32/CMakeLists.txt → external/db_drivers/liblmdb32/CMakeLists.txt
diff --git a/db_drivers/liblmdb32/COPYRIGHT → external/db_drivers/liblmdb32/COPYRIGHT b/db_drivers/liblmdb32/COPYRIGHT → external/db_drivers/liblmdb32/COPYRIGHT
diff --git a/db_drivers/liblmdb32/Doxyfile → external/db_drivers/liblmdb32/Doxyfile b/db_drivers/liblmdb32/Doxyfile → external/db_drivers/liblmdb32/Doxyfile
diff --git a/db_drivers/liblmdb32/LICENSE → external/db_drivers/liblmdb32/LICENSE b/db_drivers/liblmdb32/LICENSE → external/db_drivers/liblmdb32/LICENSE
diff --git a/db_drivers/liblmdb32/Makefile → external/db_drivers/liblmdb32/Makefile b/db_drivers/liblmdb32/Makefile → external/db_drivers/liblmdb32/Makefile
diff --git a/db_drivers/liblmdb32/lmdb.h → external/db_drivers/liblmdb32/lmdb.h b/db_drivers/liblmdb32/lmdb.h → external/db_drivers/liblmdb32/lmdb.h
diff --git a/db_drivers/liblmdb32/mdb.c → external/db_drivers/liblmdb32/mdb.c b/db_drivers/liblmdb32/mdb.c → external/db_drivers/liblmdb32/mdb.c
diff --git a/db_drivers/liblmdb32/mdb_copy.1 → external/db_drivers/liblmdb32/mdb_copy.1 b/db_drivers/liblmdb32/mdb_copy.1 → external/db_drivers/liblmdb32/mdb_copy.1
diff --git a/db_drivers/liblmdb32/mdb_copy.c → external/db_drivers/liblmdb32/mdb_copy.c b/db_drivers/liblmdb32/mdb_copy.c → external/db_drivers/liblmdb32/mdb_copy.c
diff --git a/db_drivers/liblmdb32/mdb_dump.1 → external/db_drivers/liblmdb32/mdb_dump.1 b/db_drivers/liblmdb32/mdb_dump.1 → external/db_drivers/liblmdb32/mdb_dump.1
diff --git a/db_drivers/liblmdb32/mdb_dump.c → external/db_drivers/liblmdb32/mdb_dump.c b/db_drivers/liblmdb32/mdb_dump.c → external/db_drivers/liblmdb32/mdb_dump.c
diff --git a/db_drivers/liblmdb32/mdb_load.1 → external/db_drivers/liblmdb32/mdb_load.1 b/db_drivers/liblmdb32/mdb_load.1 → external/db_drivers/liblmdb32/mdb_load.1
diff --git a/db_drivers/liblmdb32/mdb_load.c → external/db_drivers/liblmdb32/mdb_load.c b/db_drivers/liblmdb32/mdb_load.c → external/db_drivers/liblmdb32/mdb_load.c
diff --git a/db_drivers/liblmdb32/mdb_stat.1 → external/db_drivers/liblmdb32/mdb_stat.1 b/db_drivers/liblmdb32/mdb_stat.1 → external/db_drivers/liblmdb32/mdb_stat.1
diff --git a/db_drivers/liblmdb32/mdb_stat.c → external/db_drivers/liblmdb32/mdb_stat.c b/db_drivers/liblmdb32/mdb_stat.c → external/db_drivers/liblmdb32/mdb_stat.c
diff --git a/db_drivers/liblmdb32/midl.c → external/db_drivers/liblmdb32/midl.c b/db_drivers/liblmdb32/midl.c → external/db_drivers/liblmdb32/midl.c
diff --git a/db_drivers/liblmdb32/midl.h → external/db_drivers/liblmdb32/midl.h b/db_drivers/liblmdb32/midl.h → external/db_drivers/liblmdb32/midl.h
diff --git a/db_drivers/liblmdb32/mtest.c → external/db_drivers/liblmdb32/mtest.c b/db_drivers/liblmdb32/mtest.c → external/db_drivers/liblmdb32/mtest.c
diff --git a/db_drivers/liblmdb32/mtest2.c → external/db_drivers/liblmdb32/mtest2.c b/db_drivers/liblmdb32/mtest2.c → external/db_drivers/liblmdb32/mtest2.c
diff --git a/db_drivers/liblmdb32/mtest3.c → external/db_drivers/liblmdb32/mtest3.c b/db_drivers/liblmdb32/mtest3.c → external/db_drivers/liblmdb32/mtest3.c
diff --git a/db_drivers/liblmdb32/mtest4.c → external/db_drivers/liblmdb32/mtest4.c b/db_drivers/liblmdb32/mtest4.c → external/db_drivers/liblmdb32/mtest4.c
diff --git a/db_drivers/liblmdb32/mtest5.c → external/db_drivers/liblmdb32/mtest5.c b/db_drivers/liblmdb32/mtest5.c → external/db_drivers/liblmdb32/mtest5.c
diff --git a/db_drivers/liblmdb32/mtest6.c → external/db_drivers/liblmdb32/mtest6.c b/db_drivers/liblmdb32/mtest6.c → external/db_drivers/liblmdb32/mtest6.c
diff --git a/db_drivers/liblmdb32/sample-bdb.txt → external/db_drivers/liblmdb32/sample-bdb.txt b/db_drivers/liblmdb32/sample-bdb.txt → external/db_drivers/liblmdb32/sample-bdb.txt
diff --git a/db_drivers/liblmdb32/sample-mdb.txt → external/db_drivers/liblmdb32/sample-mdb.txt b/db_drivers/liblmdb32/sample-mdb.txt → external/db_drivers/liblmdb32/sample-mdb.txt
diff --git a/db_drivers/liblmdb32/tooltag → external/db_drivers/liblmdb32/tooltag b/db_drivers/liblmdb32/tooltag → external/db_drivers/liblmdb32/tooltag
diff --git a/db_drivers/liblmdb64/.gitignore → external/db_drivers/liblmdb64/.gitignore b/db_drivers/liblmdb64/.gitignore → external/db_drivers/liblmdb64/.gitignore
diff --git a/db_drivers/liblmdb64/CHANGES → external/db_drivers/liblmdb64/CHANGES b/db_drivers/liblmdb64/CHANGES → external/db_drivers/liblmdb64/CHANGES
diff --git a/db_drivers/liblmdb64/CMakeLists.txt → external/db_drivers/liblmdb64/CMakeLists.txt b/db_drivers/liblmdb64/CMakeLists.txt → external/db_drivers/liblmdb64/CMakeLists.txt
diff --git a/db_drivers/liblmdb64/COPYRIGHT → external/db_drivers/liblmdb64/COPYRIGHT b/db_drivers/liblmdb64/COPYRIGHT → external/db_drivers/liblmdb64/COPYRIGHT
diff --git a/db_drivers/liblmdb64/Doxyfile → external/db_drivers/liblmdb64/Doxyfile b/db_drivers/liblmdb64/Doxyfile → external/db_drivers/liblmdb64/Doxyfile
diff --git a/db_drivers/liblmdb64/LICENSE → external/db_drivers/liblmdb64/LICENSE b/db_drivers/liblmdb64/LICENSE → external/db_drivers/liblmdb64/LICENSE
diff --git a/db_drivers/liblmdb64/Makefile → external/db_drivers/liblmdb64/Makefile b/db_drivers/liblmdb64/Makefile → external/db_drivers/liblmdb64/Makefile
diff --git a/db_drivers/liblmdb64/lmdb.h → external/db_drivers/liblmdb64/lmdb.h b/db_drivers/liblmdb64/lmdb.h → external/db_drivers/liblmdb64/lmdb.h
diff --git a/db_drivers/liblmdb64/mdb.c → external/db_drivers/liblmdb64/mdb.c b/db_drivers/liblmdb64/mdb.c → external/db_drivers/liblmdb64/mdb.c
diff --git a/db_drivers/liblmdb64/mdb_copy.1 → external/db_drivers/liblmdb64/mdb_copy.1 b/db_drivers/liblmdb64/mdb_copy.1 → external/db_drivers/liblmdb64/mdb_copy.1
diff --git a/db_drivers/liblmdb64/mdb_copy.c → external/db_drivers/liblmdb64/mdb_copy.c b/db_drivers/liblmdb64/mdb_copy.c → external/db_drivers/liblmdb64/mdb_copy.c
diff --git a/db_drivers/liblmdb64/mdb_dump.1 → external/db_drivers/liblmdb64/mdb_dump.1 b/db_drivers/liblmdb64/mdb_dump.1 → external/db_drivers/liblmdb64/mdb_dump.1
diff --git a/db_drivers/liblmdb64/mdb_dump.c → external/db_drivers/liblmdb64/mdb_dump.c b/db_drivers/liblmdb64/mdb_dump.c → external/db_drivers/liblmdb64/mdb_dump.c
diff --git a/db_drivers/liblmdb64/mdb_load.1 → external/db_drivers/liblmdb64/mdb_load.1 b/db_drivers/liblmdb64/mdb_load.1 → external/db_drivers/liblmdb64/mdb_load.1
diff --git a/db_drivers/liblmdb64/mdb_load.c → external/db_drivers/liblmdb64/mdb_load.c b/db_drivers/liblmdb64/mdb_load.c → external/db_drivers/liblmdb64/mdb_load.c
diff --git a/db_drivers/liblmdb64/mdb_stat.1 → external/db_drivers/liblmdb64/mdb_stat.1 b/db_drivers/liblmdb64/mdb_stat.1 → external/db_drivers/liblmdb64/mdb_stat.1
diff --git a/db_drivers/liblmdb64/mdb_stat.c → external/db_drivers/liblmdb64/mdb_stat.c b/db_drivers/liblmdb64/mdb_stat.c → external/db_drivers/liblmdb64/mdb_stat.c
diff --git a/db_drivers/liblmdb64/midl.c → external/db_drivers/liblmdb64/midl.c b/db_drivers/liblmdb64/midl.c → external/db_drivers/liblmdb64/midl.c
diff --git a/db_drivers/liblmdb64/midl.h → external/db_drivers/liblmdb64/midl.h b/db_drivers/liblmdb64/midl.h → external/db_drivers/liblmdb64/midl.h
diff --git a/db_drivers/liblmdb64/mtest.c → external/db_drivers/liblmdb64/mtest.c b/db_drivers/liblmdb64/mtest.c → external/db_drivers/liblmdb64/mtest.c
diff --git a/db_drivers/liblmdb64/mtest2.c → external/db_drivers/liblmdb64/mtest2.c b/db_drivers/liblmdb64/mtest2.c → external/db_drivers/liblmdb64/mtest2.c
diff --git a/db_drivers/liblmdb64/mtest3.c → external/db_drivers/liblmdb64/mtest3.c b/db_drivers/liblmdb64/mtest3.c → external/db_drivers/liblmdb64/mtest3.c
diff --git a/db_drivers/liblmdb64/mtest4.c → external/db_drivers/liblmdb64/mtest4.c b/db_drivers/liblmdb64/mtest4.c → external/db_drivers/liblmdb64/mtest4.c
diff --git a/db_drivers/liblmdb64/mtest5.c → external/db_drivers/liblmdb64/mtest5.c b/db_drivers/liblmdb64/mtest5.c → external/db_drivers/liblmdb64/mtest5.c
diff --git a/db_drivers/liblmdb64/mtest6.c → external/db_drivers/liblmdb64/mtest6.c b/db_drivers/liblmdb64/mtest6.c → external/db_drivers/liblmdb64/mtest6.c
diff --git a/db_drivers/liblmdb64/sample-bdb.txt → external/db_drivers/liblmdb64/sample-bdb.txt b/db_drivers/liblmdb64/sample-bdb.txt → external/db_drivers/liblmdb64/sample-bdb.txt
diff --git a/db_drivers/liblmdb64/sample-mdb.txt → external/db_drivers/liblmdb64/sample-mdb.txt b/db_drivers/liblmdb64/sample-mdb.txt → external/db_drivers/liblmdb64/sample-mdb.txt
diff --git a/db_drivers/liblmdb64/tooltag → external/db_drivers/liblmdb64/tooltag b/db_drivers/liblmdb64/tooltag → external/db_drivers/liblmdb64/tooltag