mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-08-15 01:03:23 +00:00
Merge pull request #13 from moneromooo-monero/blockchain
Add lmdb to the cmake gunk, and use actual user directory for the blockchain location
This commit is contained in:
commit
e285ee5aec
4 changed files with 69 additions and 6 deletions
|
@ -138,8 +138,8 @@ link_directories(${UNBOUND_LIBRARY_DIRS})
|
||||||
# Final setup for rapidjson
|
# Final setup for rapidjson
|
||||||
include_directories(external/rapidjson)
|
include_directories(external/rapidjson)
|
||||||
|
|
||||||
# TODO: make this find lmdb similarly to how unbound and boost are handled
|
find_package(LMDB REQUIRED)
|
||||||
set(LMDB_LIBRARIES "-llmdb")
|
include_directories(${LMDB_INCLUDE})
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
add_definitions("/bigobj /MP /W3 /GS- /D_CRT_SECURE_NO_WARNINGS /wd4996 /wd4345 /D_WIN32_WINNT=0x0600 /DWIN32_LEAN_AND_MEAN /DGTEST_HAS_TR1_TUPLE=0 /FIinline_c.h /D__SSE4_1__")
|
add_definitions("/bigobj /MP /W3 /GS- /D_CRT_SECURE_NO_WARNINGS /wd4996 /wd4345 /D_WIN32_WINNT=0x0600 /DWIN32_LEAN_AND_MEAN /DGTEST_HAS_TR1_TUPLE=0 /FIinline_c.h /D__SSE4_1__")
|
||||||
|
|
61
cmake/FindLMDB.cmake
Normal file
61
cmake/FindLMDB.cmake
Normal file
|
@ -0,0 +1,61 @@
|
||||||
|
# Copyright (c) 2014, The Monero Project
|
||||||
|
# All rights reserved.
|
||||||
|
#
|
||||||
|
# Redistribution and use in source and binary forms, with or without modification, are
|
||||||
|
# permitted provided that the following conditions are met:
|
||||||
|
#
|
||||||
|
# 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||||
|
# conditions and the following disclaimer.
|
||||||
|
#
|
||||||
|
# 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||||
|
# of conditions and the following disclaimer in the documentation and/or other
|
||||||
|
# materials provided with the distribution.
|
||||||
|
#
|
||||||
|
# 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||||
|
# used to endorse or promote products derived from this software without specific
|
||||||
|
# prior written permission.
|
||||||
|
#
|
||||||
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||||
|
# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
|
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||||
|
# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||||
|
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||||
|
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
MESSAGE(STATUS "Looking for liblmdb")
|
||||||
|
|
||||||
|
FIND_PATH(LMDB_INCLUDE_DIR
|
||||||
|
NAMES lmdb.h
|
||||||
|
PATH_SUFFIXES include/ include/lmdb/
|
||||||
|
PATHS "${PROJECT_SOURCE_DIR}"
|
||||||
|
${LMDB_ROOT}
|
||||||
|
$ENV{LMDB_ROOT}
|
||||||
|
/usr/local/
|
||||||
|
/usr/
|
||||||
|
)
|
||||||
|
|
||||||
|
if(STATIC)
|
||||||
|
if(MINGW)
|
||||||
|
find_library(LMDB_LIBRARIES liblmdb.dll.a)
|
||||||
|
else()
|
||||||
|
find_library(LMDB_LIBRARIES liblmdb.a)
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
find_library(LMDB_LIBRARIES lmdb)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
IF(LMDB_INCLUDE_DIR)
|
||||||
|
MESSAGE(STATUS "Found liblmdb include (lmdb.h) in ${LMDB_INCLUDE_DIR}")
|
||||||
|
IF(LMDB_LIBRARIES)
|
||||||
|
MESSAGE(STATUS "Found liblmdb library")
|
||||||
|
set(LMDB_INCLUDE ${LMDB_INCLUDE_DIR})
|
||||||
|
set(LMDB_LIBRARY ${LMDB_LIBRARIES})
|
||||||
|
ELSE()
|
||||||
|
MESSAGE(FATAL_ERROR "${BoldRed}Could not find liblmdb library, please make sure you have installed liblmdb or liblmdb-dev or the equivalent${ColourReset}")
|
||||||
|
ENDIF()
|
||||||
|
ELSE()
|
||||||
|
MESSAGE(FATAL_ERROR "${BoldRed}Could not find liblmdb library, please make sure you have installed liblmdb or liblmdb-dev or the equivalent${ColourReset}")
|
||||||
|
ENDIF()
|
|
@ -52,20 +52,22 @@ struct fake_core
|
||||||
|
|
||||||
fake_core() : m_pool(dummy), dummy(m_pool), m_storage(&m_pool)
|
fake_core() : m_pool(dummy), dummy(m_pool), m_storage(&m_pool)
|
||||||
{
|
{
|
||||||
m_pool.init("/home/user/.bitmonero");
|
boost::filesystem::path default_data_path {tools::get_default_data_dir()};
|
||||||
m_storage.init("/home/user/.bitmonero", false);
|
m_pool.init(default_data_path.string());
|
||||||
|
m_storage.init(default_data_path.string(), false);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
int main(int argc, char* argv[])
|
int main(int argc, char* argv[])
|
||||||
{
|
{
|
||||||
fake_core c;
|
fake_core c;
|
||||||
|
boost::filesystem::path default_data_path {tools::get_default_data_dir()};
|
||||||
|
|
||||||
BlockchainDB *blockchain;
|
BlockchainDB *blockchain;
|
||||||
|
|
||||||
blockchain = new BlockchainLMDB();
|
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)
|
for (uint64_t i = 0; i < c.m_storage.get_current_blockchain_height(); ++i)
|
||||||
{
|
{
|
||||||
|
|
|
@ -83,5 +83,5 @@ target_link_libraries(cryptonote_core
|
||||||
${Boost_FILESYSTEM_LIBRARY}
|
${Boost_FILESYSTEM_LIBRARY}
|
||||||
${Boost_SYSTEM_LIBRARY}
|
${Boost_SYSTEM_LIBRARY}
|
||||||
${Boost_THREAD_LIBRARY}
|
${Boost_THREAD_LIBRARY}
|
||||||
${LMDB_LIBRARIES}
|
${LMDB_LIBRARY}
|
||||||
${EXTRA_LIBRARIES})
|
${EXTRA_LIBRARIES})
|
||||||
|
|
Loading…
Reference in a new issue