mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 23:01:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update rocksdb to 6.1.2, adds optional zstd feature (#7304)

Browse Source
This commit is contained in:
Brad Barnich 2019-07-17 18:13:28 -04:00 committed by Phil Christensen
parent 800fd63cf3
commit 4d2d85765f
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/rocksdb/CONTROL
View File

@ -1,5 +1,5 @@
Source: rocksdb Source: rocksdb
Version: 6.0.2 Version: 6.1.2
Homepage: https://github.com/facebook/rocksdb Homepage: https://github.com/facebook/rocksdb
Description: A library that provides an embeddable, persistent key-value store for fast storage Description: A library that provides an embeddable, persistent key-value store for fast storage
Default-Features: zlib Default-Features: zlib
@ -19,3 +19,7 @@ Description: zlib support in rocksdb
Feature: tbb Feature: tbb
Build-Depends: tbb Build-Depends: tbb
Description: tbb support in rocksdb Description: tbb support in rocksdb
Feature: zstd
Build-Depends: zstd
Description: zstd support in rocksdb

13
ports/rocksdb/Findzstd.cmake Normal file
View File

@ -0,0 +1,13 @@
find_path(ZSTD_INCLUDE_DIR zstd.h)
find_library(ZSTD_LIBRARY_DEBUG NAMES zstd)
find_library(ZSTD_LIBRARY_RELEASE NAMES zstd)
include(SelectLibraryConfigurations)
select_library_configurations(ZSTD)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(
ZSTD DEFAULT_MSG
ZSTD_LIBRARY ZSTD_INCLUDE_DIR
)

11
ports/rocksdb/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/rocksdb REPO facebook/rocksdb
REF v6.0.2 REF v6.1.2
SHA512 6659f04c9823750b9b635e2a247b59dbda4975458615392df82bdbeb4ac7ac783e6de86a32fcc318aae1bb27880557390c544c99caa3db3885f9c3d836cc1df8 SHA512 3d9e994b202c9f1c1c188e37a4f781bb97af5ba72f2f3f59091b79f402b819c9765dcd1e7d0851b5119c0bf510aa3f5bed44a542798ee81795a8328d71554b38
HEAD_REF master HEAD_REF master
PATCHES PATCHES
0001-disable-gtest.patch 0001-disable-gtest.patch
@ -18,6 +18,7 @@ file(REMOVE "${SOURCE_PATH}/cmake/modules/Findzlib.cmake")
file(COPY file(COPY
"${CMAKE_CURRENT_LIST_DIR}/Findlz4.cmake" "${CMAKE_CURRENT_LIST_DIR}/Findlz4.cmake"
"${CMAKE_CURRENT_LIST_DIR}/Findsnappy.cmake" "${CMAKE_CURRENT_LIST_DIR}/Findsnappy.cmake"
"${CMAKE_CURRENT_LIST_DIR}/Findzstd.cmake"
DESTINATION "${SOURCE_PATH}/cmake/modules" DESTINATION "${SOURCE_PATH}/cmake/modules"
) )
@ -40,6 +41,11 @@ if("zlib" IN_LIST FEATURES)
set(WITH_ZLIB ON) set(WITH_ZLIB ON)
endif() endif()
set(WITH_ZLIB OFF)
if("zstd" IN_LIST FEATURES)
set(WITH_ZLIB ON)
endif()
set(WITH_TBB OFF) set(WITH_TBB OFF)
set(ROCKSDB_IGNORE_PACKAGE_TBB TRUE) set(ROCKSDB_IGNORE_PACKAGE_TBB TRUE)
if("tbb" IN_LIST FEATURES) if("tbb" IN_LIST FEATURES)
@ -57,6 +63,7 @@ vcpkg_configure_cmake(
-DWITH_LZ4=${WITH_LZ4} -DWITH_LZ4=${WITH_LZ4}
-DWITH_ZLIB=${WITH_ZLIB} -DWITH_ZLIB=${WITH_ZLIB}
-DWITH_TBB=${WITH_TBB} -DWITH_TBB=${WITH_TBB}
-DWITH_ZSTD=${WITH_ZSTD}
-DWITH_TESTS=OFF -DWITH_TESTS=OFF
-DUSE_RTTI=1 -DUSE_RTTI=1
-DROCKSDB_INSTALL_ON_WINDOWS=ON -DROCKSDB_INSTALL_ON_WINDOWS=ON