diff options
| author | Koby Kahane <kobykahane@gmail.com> | 2018-04-03 02:32:41 +0300 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-04-02 16:32:41 -0700 |
| commit | c4aaab17b4447597dbd72b2fc36d669c5b806a9c (patch) | |
| tree | 79451c99e04081ae7ab5c4097d98033e0bcdd629 | |
| parent | 55d79020c4a99d658e46b3a88b065712b9e828c8 (diff) | |
| download | vcpkg-c4aaab17b4447597dbd72b2fc36d669c5b806a9c.tar.gz vcpkg-c4aaab17b4447597dbd72b2fc36d669c5b806a9c.zip | |
[rocksdb] Make zlib support an optional feature (#3189)
* [rocksdb] Make zlib support an optional feature.
* [rocksdb] Add zlib as a default feature
| -rw-r--r-- | ports/rocksdb/CONTROL | 8 | ||||
| -rw-r--r-- | ports/rocksdb/portfile.cmake | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL index 5e6851f83..6e3f6a4c5 100644 --- a/ports/rocksdb/CONTROL +++ b/ports/rocksdb/CONTROL @@ -1,7 +1,7 @@ Source: rocksdb -Version: 5.11.3-1 +Version: 5.11.3-3 Description: A library that provides an embeddable, persistent key-value store for fast storage -Build-Depends: zlib +Default-Features: zlib Feature: lz4 Build-Depends: lz4 @@ -10,3 +10,7 @@ Description: lz4 support in rocksdb Feature: snappy Build-Depends: snappy Description: snappy support in rocksdb + +Feature: zlib +Build-Depends: zlib +Description: zlib support in rocksdb diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 0278a3b84..169573cf3 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -42,6 +42,11 @@ if("snappy" IN_LIST FEATURES) set(WITH_SNAPPY ON) endif() +set(WITH_ZLIB OFF) +if("zlib" IN_LIST FEATURES) + set(WITH_ZLIB ON) +endif() + get_filename_component(ROCKSDB_VERSION "${SOURCE_PATH}" NAME) string(REPLACE "rocksdb-rocksdb-" "" ROCKSDB_VERSION "${ROCKSDB_VERSION}") @@ -52,7 +57,7 @@ vcpkg_configure_cmake( -DWITH_GFLAGS=0 -DWITH_SNAPPY=${WITH_SNAPPY} -DWITH_LZ4=${WITH_LZ4} - -DWITH_ZLIB=1 + -DWITH_ZLIB=${WITH_ZLIB} -DWITH_TESTS=OFF -DROCKSDB_INSTALL_ON_WINDOWS=ON -DFAIL_ON_WARNINGS=OFF |