CMake: Use leveldb from Hunter on Windows

ethereum · Mar 26, 2019 · 2afac08 · 2afac08
1 parent 85ad3e2
commit 2afac08
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -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

diff --git a/libdevcore/CMakeLists.txt b/libdevcore/CMakeLists.txt
@@ -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)