diff options
| author | Brad Barnich <brad@careevolution.com> | 2019-07-17 18:13:28 -0400 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-07-17 15:13:28 -0700 |
| commit | 4d2d85765f61c874d28d4301bdffe39ad1f482ed (patch) | |
| tree | 37c08ce4df1d464b5346e9232d1525293b2a7564 | |
| parent | 800fd63cf3c1824784fa8c4caff122ab453661ce (diff) | |
| download | vcpkg-4d2d85765f61c874d28d4301bdffe39ad1f482ed.tar.gz vcpkg-4d2d85765f61c874d28d4301bdffe39ad1f482ed.zip | |
Update rocksdb to 6.1.2, adds optional zstd feature (#7304)
| -rw-r--r-- | ports/rocksdb/CONTROL | 6 | ||||
| -rw-r--r-- | ports/rocksdb/Findzstd.cmake | 13 | ||||
| -rw-r--r-- | ports/rocksdb/portfile.cmake | 11 |
3 files changed, 27 insertions, 3 deletions
diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL index 6e35d8a9b..6daf694b5 100644 --- a/ports/rocksdb/CONTROL +++ b/ports/rocksdb/CONTROL @@ -1,5 +1,5 @@ Source: rocksdb -Version: 6.0.2 +Version: 6.1.2 Homepage: https://github.com/facebook/rocksdb Description: A library that provides an embeddable, persistent key-value store for fast storage Default-Features: zlib @@ -19,3 +19,7 @@ Description: zlib support in rocksdb Feature: tbb Build-Depends: tbb Description: tbb support in rocksdb + +Feature: zstd +Build-Depends: zstd +Description: zstd support in rocksdb diff --git a/ports/rocksdb/Findzstd.cmake b/ports/rocksdb/Findzstd.cmake new file mode 100644 index 000000000..f047fc2a9 --- /dev/null +++ b/ports/rocksdb/Findzstd.cmake @@ -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
+)
diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 27a9d70d5..7cab8b7d9 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb - REF v6.0.2 - SHA512 6659f04c9823750b9b635e2a247b59dbda4975458615392df82bdbeb4ac7ac783e6de86a32fcc318aae1bb27880557390c544c99caa3db3885f9c3d836cc1df8 + REF v6.1.2 + SHA512 3d9e994b202c9f1c1c188e37a4f781bb97af5ba72f2f3f59091b79f402b819c9765dcd1e7d0851b5119c0bf510aa3f5bed44a542798ee81795a8328d71554b38 HEAD_REF master PATCHES 0001-disable-gtest.patch @@ -18,6 +18,7 @@ file(REMOVE "${SOURCE_PATH}/cmake/modules/Findzlib.cmake") file(COPY "${CMAKE_CURRENT_LIST_DIR}/Findlz4.cmake" "${CMAKE_CURRENT_LIST_DIR}/Findsnappy.cmake" + "${CMAKE_CURRENT_LIST_DIR}/Findzstd.cmake" DESTINATION "${SOURCE_PATH}/cmake/modules" ) @@ -40,6 +41,11 @@ if("zlib" IN_LIST FEATURES) set(WITH_ZLIB ON) endif() +set(WITH_ZLIB OFF) +if("zstd" IN_LIST FEATURES) + set(WITH_ZLIB ON) +endif() + set(WITH_TBB OFF) set(ROCKSDB_IGNORE_PACKAGE_TBB TRUE) if("tbb" IN_LIST FEATURES) @@ -57,6 +63,7 @@ vcpkg_configure_cmake( -DWITH_LZ4=${WITH_LZ4} -DWITH_ZLIB=${WITH_ZLIB} -DWITH_TBB=${WITH_TBB} + -DWITH_ZSTD=${WITH_ZSTD} -DWITH_TESTS=OFF -DUSE_RTTI=1 -DROCKSDB_INSTALL_ON_WINDOWS=ON |