From 0886183568a41b41c83e9cd7f624de295d8367c3 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Sat, 6 Dec 2014 15:47:49 +0000 Subject: [PATCH] build: add liblmdb to the cmake autodetection system update for rebase (warptangent 2015-01-04) src/cryptonote_core/CMakeLists.txt (edit) - replace LMDB_LIBRARIES with LMDB_LIBRARY set from autodetection --- CMakeLists.txt | 4 +- cmake/FindLMDB.cmake | 61 ++++++++++++++++++++++++++++++ src/cryptonote_core/CMakeLists.txt | 2 +- 3 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 cmake/FindLMDB.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 000a18df..ee5d5f2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,8 +138,8 @@ link_directories(${UNBOUND_LIBRARY_DIRS}) # Final setup for rapidjson include_directories(external/rapidjson) -# TODO: make this find lmdb similarly to how unbound and boost are handled -set(LMDB_LIBRARIES "-llmdb") +find_package(LMDB REQUIRED) +include_directories(${LMDB_INCLUDE}) 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__") diff --git a/cmake/FindLMDB.cmake b/cmake/FindLMDB.cmake new file mode 100644 index 00000000..743cc486 --- /dev/null +++ b/cmake/FindLMDB.cmake @@ -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() diff --git a/src/cryptonote_core/CMakeLists.txt b/src/cryptonote_core/CMakeLists.txt index 93c3cb51..fc9cc629 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})