bdnugget/freeminer
1
0 Fork 0
mirror of https://github.com/bdnugget/freeminer.git synced 2026-11-07 06:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix leveldb find

Browse Source
This commit is contained in:
proller committed 2025-03-07 16:36:53 +01:00
1 parent bc785fb1e0
commit 069362d074
3 files changed
+11 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build_tools/build.sh
+1 -1
View File
@@ -48,7 +48,7 @@ git pull --rebase ||:
git submodule update --init --recursive ||:
#compile
cmake .. -GNinja -DENABLE_GLES=1 -DCMAKE_C_COMPILER=`which clang` -DCMAKE_CXX_COMPILER=`which clang++` ${CMAKE_OPT}
cmake .. -GNinja -DENABLE_GLES=1 -DCMAKE_C_COMPILER=`which clang` -DCMAKE_CXX_COMPILER=`which clang++` -DBUILD_UNITTESTS=0 ${CMAKE_OPT}
nice cmake --build .
build_tools/docker.sh
+1 -1
View File
@@ -3,4 +3,4 @@
# IMAGE=manjarolinux ./docker.sh
# IMAGE=archlinux ./docker.sh
docker run -v $(pwd)/..:/work -it ${IMAGE=ubuntu} bash -c " cd /work && build_tools/build.sh "
docker run -v $(pwd)/..:/work -it ${IMAGE=ubuntu} env CCACHE_DIR=/work/.ccache bash -c " cd /work/build_tools/; ./build.sh "
src/CMakeLists.txt
+9 -12
View File
@@ -231,9 +231,8 @@ if(ENABLE_LEVELDB)
message (STATUS "Snappy library: ${SNAPPY_LIBRARY} : ${SNAPPY_INCLUDE_DIR}")
message (STATUS "Leveldb library: ${LEVELDB_LIBRARY} : ${LEVELDB_INCLUDE_DIR}")
if (NOT SNAPPY_INCLUDE_DIR OR NOT SNAPPY_LIBRARY)
find_path(SNAPPY_INCLUDE_DIR snappy.h PATHS ${PROJECT_SOURCE_DIR}/external/snappy NO_DEFAULT_PATH)
if (SNAPPY_INCLUDE_DIR)
if ((NOT SNAPPY_INCLUDE_DIR OR NOT SNAPPY_LIBRARY) AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/snappy/snappy.h)
set(SNAPPY_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/snappy)
# Snappy have no cmake by default,
# git clone --recursive --depth 1 https://github.com/google/snappy src/external/snappy
# But we can collect something from pulls
@@ -243,16 +242,14 @@ if(ENABLE_LEVELDB)
set(SNAPPY_INSTALL 0 CACHE INTERNAL "")
set(HAVE_TCMALLOC 0 CACHE INTERNAL "")
add_subdirectory(${PROJECT_SOURCE_DIR}/external/snappy)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/snappy)
set(SNAPPY_LIBRARY snappy)
set(HAVE_SNAPPY 1 CACHE INTERNAL "")
message(STATUS "Using bundled snappy ${SNAPPY_LIBRARY} : ${SNAPPY_INCLUDE_DIR}")
endif()
endif()
if (NOT LEVELDB_INCLUDE_DIR OR NOT LEVELDB_LIBRARY)
find_path(LEVELDB_INCLUDE_DIR NAMES leveldb/db.h PATHS ${PROJECT_SOURCE_DIR}/external/leveldb/include NO_DEFAULT_PATH)
if (LEVELDB_INCLUDE_DIR)
if ((NOT LEVELDB_INCLUDE_DIR OR NOT LEVELDB_LIBRARY) AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/leveldb/include/leveldb/db.h)
set(LEVELDB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/leveldb/include)
# bad try direct make build
#find_path(LEVELDB_MAKEFILE_DIR Makefile ${PROJECT_SOURCE_DIR}/external/leveldb NO_DEFAULT_PATH)
#if (LEVELDB_MAKEFILE_DIR)
@@ -270,10 +267,9 @@ if(ENABLE_LEVELDB)
set(LEVELDB_BUILD_BENCHMARKS 0 CACHE INTERNAL "")
set(LEVELDB_INSTALL 0 CACHE INTERNAL "")
set(HAVE_CLANG_THREAD_SAFETY 0 CACHE INTERNAL "") # -Werror remove
add_subdirectory(${PROJECT_SOURCE_DIR}/external/leveldb)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/leveldb)
set(LEVELDB_LIBRARY leveldb)
message(STATUS "Using bundled leveldb ${LEVELDB_INCLUDE_DIR} ${LEVELDB_LIBRARY}")
endif()
endif()
if(SNAPPY_LIBRARY AND SNAPPY_INCLUDE_DIR)
@@ -579,7 +575,7 @@ endif()
if(ENABLE_ENET)
if(NOT ENABLE_SYSTEM_ENET AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/enet/include/enet/enet.h)
add_subdirectory(external/enet)
set(ENET_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/external/enet/include)
set(ENET_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/enet/include)
set(ENET_LIBRARY enet)
endif()
if(NOT ENET_LIBRARY)
@@ -610,7 +606,8 @@ if(ENABLE_TIFF AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/libtiff/CMakeList
set(USE_TIFF 1)
endif()
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/libosmium/CMakeLists.txt)
option(ENABLE_OSMIUM "Enable Osmium" 1)
if(ENABLE_OSMIUM AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/libosmium/CMakeLists.txt)
set(BUILD_TESTING 0 CACHE INTERNAL "")
set(BUILD_DATA_TESTS 0 CACHE INTERNAL "")
set(BUILD_EXAMPLES 0 CACHE INTERNAL "")