aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Winget <tewinget@gmail.com>2015-03-17 18:03:11 -0400
committerThomas Winget <tewinget@gmail.com>2015-03-17 18:03:11 -0400
commit11e815761f31b84d96c37cc621c58669ce0c3d1b (patch)
tree6760c2288ed4502c4ceb4034baf7281a7501e076
parentRevert "Build fixed, goofed up some CMake" (diff)
downloadmonero-11e815761f31b84d96c37cc621c58669ce0c3d1b.tar.xz
Revert "Moved db_drivers/ into external/ for consistency"
This reverts commit b21335642e75b35d3b178a754f4cdb2314989cd1.
-rw-r--r--CMakeLists.txt3
-rw-r--r--db_drivers/CMakeLists.txt (renamed from external/db_drivers/CMakeLists.txt)0
-rw-r--r--db_drivers/liblmdb/.gitignore (renamed from external/db_drivers/liblmdb/.gitignore)0
-rw-r--r--db_drivers/liblmdb/CHANGES (renamed from external/db_drivers/liblmdb/CHANGES)0
-rw-r--r--db_drivers/liblmdb/CMakeLists.txt (renamed from external/db_drivers/liblmdb/CMakeLists.txt)0
-rw-r--r--db_drivers/liblmdb/COPYRIGHT (renamed from external/db_drivers/liblmdb/COPYRIGHT)0
-rw-r--r--db_drivers/liblmdb/Doxyfile (renamed from external/db_drivers/liblmdb/Doxyfile)0
-rw-r--r--db_drivers/liblmdb/LICENSE (renamed from external/db_drivers/liblmdb/LICENSE)0
-rw-r--r--db_drivers/liblmdb/Makefile (renamed from external/db_drivers/liblmdb/Makefile)0
-rw-r--r--db_drivers/liblmdb/lmdb.h (renamed from external/db_drivers/liblmdb/lmdb.h)0
-rw-r--r--db_drivers/liblmdb/mdb.c (renamed from external/db_drivers/liblmdb/mdb.c)0
-rw-r--r--db_drivers/liblmdb/mdb_copy.1 (renamed from external/db_drivers/liblmdb/mdb_copy.1)0
-rw-r--r--db_drivers/liblmdb/mdb_copy.c (renamed from external/db_drivers/liblmdb/mdb_copy.c)0
-rw-r--r--db_drivers/liblmdb/mdb_dump.1 (renamed from external/db_drivers/liblmdb/mdb_dump.1)0
-rw-r--r--db_drivers/liblmdb/mdb_dump.c (renamed from external/db_drivers/liblmdb/mdb_dump.c)0
-rw-r--r--db_drivers/liblmdb/mdb_load.1 (renamed from external/db_drivers/liblmdb/mdb_load.1)0
-rw-r--r--db_drivers/liblmdb/mdb_load.c (renamed from external/db_drivers/liblmdb/mdb_load.c)0
-rw-r--r--db_drivers/liblmdb/mdb_stat.1 (renamed from external/db_drivers/liblmdb/mdb_stat.1)0
-rw-r--r--db_drivers/liblmdb/mdb_stat.c (renamed from external/db_drivers/liblmdb/mdb_stat.c)0
-rw-r--r--db_drivers/liblmdb/midl.c (renamed from external/db_drivers/liblmdb/midl.c)0
-rw-r--r--db_drivers/liblmdb/midl.h (renamed from external/db_drivers/liblmdb/midl.h)0
-rw-r--r--db_drivers/liblmdb/mtest.c (renamed from external/db_drivers/liblmdb/mtest.c)0
-rw-r--r--db_drivers/liblmdb/mtest2.c (renamed from external/db_drivers/liblmdb/mtest2.c)0
-rw-r--r--db_drivers/liblmdb/mtest3.c (renamed from external/db_drivers/liblmdb/mtest3.c)0
-rw-r--r--db_drivers/liblmdb/mtest4.c (renamed from external/db_drivers/liblmdb/mtest4.c)0
-rw-r--r--db_drivers/liblmdb/mtest5.c (renamed from external/db_drivers/liblmdb/mtest5.c)0
-rw-r--r--db_drivers/liblmdb/mtest6.c (renamed from external/db_drivers/liblmdb/mtest6.c)0
-rw-r--r--db_drivers/liblmdb/sample-bdb.txt (renamed from external/db_drivers/liblmdb/sample-bdb.txt)0
-rw-r--r--db_drivers/liblmdb/sample-mdb.txt (renamed from external/db_drivers/liblmdb/sample-mdb.txt)0
-rw-r--r--db_drivers/liblmdb/tooltag (renamed from external/db_drivers/liblmdb/tooltag)0
-rw-r--r--external/CMakeLists.txt2
31 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2916ff137..ef479095f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -159,6 +159,9 @@ 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/db_drivers/CMakeLists.txt b/db_drivers/CMakeLists.txt
index 5993ed3a2..5993ed3a2 100644
--- a/external/db_drivers/CMakeLists.txt
+++ b/db_drivers/CMakeLists.txt
diff --git a/external/db_drivers/liblmdb/.gitignore b/db_drivers/liblmdb/.gitignore
index d5102a87c..d5102a87c 100644
--- a/external/db_drivers/liblmdb/.gitignore
+++ b/db_drivers/liblmdb/.gitignore
diff --git a/external/db_drivers/liblmdb/CHANGES b/db_drivers/liblmdb/CHANGES
index 34049ba7a..34049ba7a 100644
--- a/external/db_drivers/liblmdb/CHANGES
+++ b/db_drivers/liblmdb/CHANGES
diff --git a/external/db_drivers/liblmdb/CMakeLists.txt b/db_drivers/liblmdb/CMakeLists.txt
index 62b800135..62b800135 100644
--- a/external/db_drivers/liblmdb/CMakeLists.txt
+++ b/db_drivers/liblmdb/CMakeLists.txt
diff --git a/external/db_drivers/liblmdb/COPYRIGHT b/db_drivers/liblmdb/COPYRIGHT
index e0eb484c7..e0eb484c7 100644
--- a/external/db_drivers/liblmdb/COPYRIGHT
+++ b/db_drivers/liblmdb/COPYRIGHT
diff --git a/external/db_drivers/liblmdb/Doxyfile b/db_drivers/liblmdb/Doxyfile
index 92d17b09e..92d17b09e 100644
--- a/external/db_drivers/liblmdb/Doxyfile
+++ b/db_drivers/liblmdb/Doxyfile
diff --git a/external/db_drivers/liblmdb/LICENSE b/db_drivers/liblmdb/LICENSE
index 05ad7571e..05ad7571e 100644
--- a/external/db_drivers/liblmdb/LICENSE
+++ b/db_drivers/liblmdb/LICENSE
diff --git a/external/db_drivers/liblmdb/Makefile b/db_drivers/liblmdb/Makefile
index 2d0983eff..2d0983eff 100644
--- a/external/db_drivers/liblmdb/Makefile
+++ b/db_drivers/liblmdb/Makefile
diff --git a/external/db_drivers/liblmdb/lmdb.h b/db_drivers/liblmdb/lmdb.h
index ebfbc5dc8..ebfbc5dc8 100644
--- a/external/db_drivers/liblmdb/lmdb.h
+++ b/db_drivers/liblmdb/lmdb.h
diff --git a/external/db_drivers/liblmdb/mdb.c b/db_drivers/liblmdb/mdb.c
index c4dc26903..c4dc26903 100644
--- a/external/db_drivers/liblmdb/mdb.c
+++ b/db_drivers/liblmdb/mdb.c
diff --git a/external/db_drivers/liblmdb/mdb_copy.1 b/db_drivers/liblmdb/mdb_copy.1
index 094b26056..094b26056 100644
--- a/external/db_drivers/liblmdb/mdb_copy.1
+++ b/db_drivers/liblmdb/mdb_copy.1
diff --git a/external/db_drivers/liblmdb/mdb_copy.c b/db_drivers/liblmdb/mdb_copy.c
index af0a94111..af0a94111 100644
--- a/external/db_drivers/liblmdb/mdb_copy.c
+++ b/db_drivers/liblmdb/mdb_copy.c
diff --git a/external/db_drivers/liblmdb/mdb_dump.1 b/db_drivers/liblmdb/mdb_dump.1
index 6fcc93081..6fcc93081 100644
--- a/external/db_drivers/liblmdb/mdb_dump.1
+++ b/db_drivers/liblmdb/mdb_dump.1
diff --git a/external/db_drivers/liblmdb/mdb_dump.c b/db_drivers/liblmdb/mdb_dump.c
index 0eb85fd20..0eb85fd20 100644
--- a/external/db_drivers/liblmdb/mdb_dump.c
+++ b/db_drivers/liblmdb/mdb_dump.c
diff --git a/external/db_drivers/liblmdb/mdb_load.1 b/db_drivers/liblmdb/mdb_load.1
index 728024010..728024010 100644
--- a/external/db_drivers/liblmdb/mdb_load.1
+++ b/db_drivers/liblmdb/mdb_load.1
diff --git a/external/db_drivers/liblmdb/mdb_load.c b/db_drivers/liblmdb/mdb_load.c
index e0d95e13c..e0d95e13c 100644
--- a/external/db_drivers/liblmdb/mdb_load.c
+++ b/db_drivers/liblmdb/mdb_load.c
diff --git a/external/db_drivers/liblmdb/mdb_stat.1 b/db_drivers/liblmdb/mdb_stat.1
index 3d8d461d9..3d8d461d9 100644
--- a/external/db_drivers/liblmdb/mdb_stat.1
+++ b/db_drivers/liblmdb/mdb_stat.1
diff --git a/external/db_drivers/liblmdb/mdb_stat.c b/db_drivers/liblmdb/mdb_stat.c
index 1e9229296..1e9229296 100644
--- a/external/db_drivers/liblmdb/mdb_stat.c
+++ b/db_drivers/liblmdb/mdb_stat.c
diff --git a/external/db_drivers/liblmdb/midl.c b/db_drivers/liblmdb/midl.c
index 88a3aff10..88a3aff10 100644
--- a/external/db_drivers/liblmdb/midl.c
+++ b/db_drivers/liblmdb/midl.c
diff --git a/external/db_drivers/liblmdb/midl.h b/db_drivers/liblmdb/midl.h
index a7f25026c..a7f25026c 100644
--- a/external/db_drivers/liblmdb/midl.h
+++ b/db_drivers/liblmdb/midl.h
diff --git a/external/db_drivers/liblmdb/mtest.c b/db_drivers/liblmdb/mtest.c
index 79b4175e7..79b4175e7 100644
--- a/external/db_drivers/liblmdb/mtest.c
+++ b/db_drivers/liblmdb/mtest.c
diff --git a/external/db_drivers/liblmdb/mtest2.c b/db_drivers/liblmdb/mtest2.c
index f1a3dbd6c..f1a3dbd6c 100644
--- a/external/db_drivers/liblmdb/mtest2.c
+++ b/db_drivers/liblmdb/mtest2.c
diff --git a/external/db_drivers/liblmdb/mtest3.c b/db_drivers/liblmdb/mtest3.c
index f705c52de..f705c52de 100644
--- a/external/db_drivers/liblmdb/mtest3.c
+++ b/db_drivers/liblmdb/mtest3.c
diff --git a/external/db_drivers/liblmdb/mtest4.c b/db_drivers/liblmdb/mtest4.c
index da5a95304..da5a95304 100644
--- a/external/db_drivers/liblmdb/mtest4.c
+++ b/db_drivers/liblmdb/mtest4.c
diff --git a/external/db_drivers/liblmdb/mtest5.c b/db_drivers/liblmdb/mtest5.c
index 39a8c728a..39a8c728a 100644
--- a/external/db_drivers/liblmdb/mtest5.c
+++ b/db_drivers/liblmdb/mtest5.c
diff --git a/external/db_drivers/liblmdb/mtest6.c b/db_drivers/liblmdb/mtest6.c
index 07d575893..07d575893 100644
--- a/external/db_drivers/liblmdb/mtest6.c
+++ b/db_drivers/liblmdb/mtest6.c
diff --git a/external/db_drivers/liblmdb/sample-bdb.txt b/db_drivers/liblmdb/sample-bdb.txt
index 6a959bd68..6a959bd68 100644
--- a/external/db_drivers/liblmdb/sample-bdb.txt
+++ b/db_drivers/liblmdb/sample-bdb.txt
diff --git a/external/db_drivers/liblmdb/sample-mdb.txt b/db_drivers/liblmdb/sample-mdb.txt
index a233ec5dd..a233ec5dd 100644
--- a/external/db_drivers/liblmdb/sample-mdb.txt
+++ b/db_drivers/liblmdb/sample-mdb.txt
diff --git a/external/db_drivers/liblmdb/tooltag b/db_drivers/liblmdb/tooltag
index 229bf16ba..229bf16ba 100644
--- a/external/db_drivers/liblmdb/tooltag
+++ b/db_drivers/liblmdb/tooltag
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 245758d9f..80e574b06 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -97,5 +97,3 @@ 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)