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

Commit 2afac08

Browse files
committed
CMake: Use leveldb from Hunter on Windows
1 parent 85ad3e2 commit 2afac08

2 files changed

Lines changed: 3 additions & 11 deletions

File tree

appveyor.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ install:
4141
- set PATH=C:\Python36-x64;C:\Python36-x64\Scripts;%PATH%
4242
- pip install requests gitpython
4343

44-
- scripts/install_deps.bat
45-
- set ETHEREUM_DEPS_PATH=%APPVEYOR_BUILD_FOLDER%\deps
4644
before_build: |
4745
if not exist build mkdir build
4846
cd build

libdevcore/CMakeLists.txt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,9 @@ target_include_directories(devcore SYSTEM PUBLIC ${Boost_INCLUDE_DIR} PRIVATE ..
88

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

11-
if (MSVC)
12-
find_package(LevelDB)
13-
target_include_directories(devcore SYSTEM PUBLIC ${LEVELDB_INCLUDE_DIRS})
14-
target_link_libraries(devcore PRIVATE ${LEVELDB_LIBRARIES})
15-
else()
16-
hunter_add_package(leveldb)
17-
find_package(leveldb CONFIG REQUIRED)
18-
target_link_libraries(devcore PRIVATE leveldb::leveldb)
19-
endif()
11+
hunter_add_package(leveldb)
12+
find_package(leveldb CONFIG REQUIRED)
13+
target_link_libraries(devcore PRIVATE leveldb::leveldb)
2014

2115
hunter_add_package(rocksdb)
2216
find_package(RocksDB CONFIG REQUIRED)

0 commit comments

Comments
 (0)