Merge pull request #13 from moneromooo-monero/blockchain

Add lmdb to the cmake gunk, and use actual user directory for the blockchain location

2 files changed, 6 insertions, 4 deletions

diff --git a/src/blockchain_converter/blockchain_converter.cpp b/src/blockchain_converter/blockchain_converter.cpp
index b18fd3525..a2b3a375f 100644
--- a/src/blockchain_converter/blockchain_converter.cpp
+++ b/src/blockchain_converter/blockchain_converter.cpp
@@ -52,20 +52,22 @@ struct fake_core
 
   fake_core() : m_pool(dummy), dummy(m_pool), m_storage(&m_pool)
   {
-    m_pool.init("/home/user/.bitmonero");
-    m_storage.init("/home/user/.bitmonero", false);
+    boost::filesystem::path default_data_path {tools::get_default_data_dir()};
+    m_pool.init(default_data_path.string());
+    m_storage.init(default_data_path.string(), false);
   }
 };
 
 int main(int argc, char* argv[])
 {
   fake_core c;
+  boost::filesystem::path default_data_path {tools::get_default_data_dir()};
 
   BlockchainDB *blockchain;
 
   blockchain = new BlockchainLMDB();
 
-  blockchain->open("/home/user/.bitmonero");
+  blockchain->open(default_data_path.string());
 
   for (uint64_t i = 0; i < c.m_storage.get_current_blockchain_height(); ++i)
   {
diff --git a/src/cryptonote_core/CMakeLists.txt b/src/cryptonote_core/CMakeLists.txt
index 93c3cb51e..fc9cc629b 100644
--- a/src/cryptonote_core/CMakeLists.txt
+++ b/src/cryptonote_core/CMakeLists.txt
@@ -83,5 +83,5 @@ target_link_libraries(cryptonote_core
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_SYSTEM_LIBRARY}
     ${Boost_THREAD_LIBRARY}
-    ${LMDB_LIBRARIES}
+    ${LMDB_LIBRARY}
     ${EXTRA_LIBRARIES})