Skip to content
This repository has been archived by the owner on Oct 28, 2021. It is now read-only.

Hunter: Use upstream leveldb 1.22 #5532

Merged
merged 4 commits into from
Jun 7, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
CMake: Use leveldb from Hunter on Windows
  • Loading branch information
chfast committed May 29, 2019
commit 8d6a62c643a453bd1335beeb44f9742871bb43ff
2 changes: 0 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ install:
- set PATH=C:\Python36-x64;C:\Python36-x64\Scripts;%PATH%
- pip install requests gitpython

- scripts/install_deps.bat
- set ETHEREUM_DEPS_PATH=%APPVEYOR_BUILD_FOLDER%\deps
before_build: |
if not exist build mkdir build
cd build
Expand Down
12 changes: 3 additions & 9 deletions libdevcore/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,9 @@ target_include_directories(devcore SYSTEM PUBLIC ${Boost_INCLUDE_DIR} PRIVATE ..

target_link_libraries(devcore PUBLIC aleth-buildinfo Boost::filesystem Boost::system Boost::log Boost::thread Threads::Threads PRIVATE ethash::ethash)

if (MSVC)
find_package(LevelDB)
target_include_directories(devcore SYSTEM PUBLIC ${LEVELDB_INCLUDE_DIRS})
target_link_libraries(devcore PRIVATE ${LEVELDB_LIBRARIES})
else()
hunter_add_package(leveldb)
find_package(leveldb CONFIG REQUIRED)
target_link_libraries(devcore PRIVATE leveldb::leveldb)
endif()
hunter_add_package(leveldb)
find_package(leveldb CONFIG REQUIRED)
target_link_libraries(devcore PRIVATE leveldb::leveldb)

hunter_add_package(rocksdb)
find_package(RocksDB CONFIG REQUIRED)
Expand Down