diff options
| author | Daniel Black <daniel@mariadb.org> | 2021-10-13 13:34:01 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2021-10-13 13:34:08 +1100 |
| commit | f483d9a1260debb29680cc4e6fc09692b2c4403a (patch) | |
| tree | 113e1428bcec00381d9d76955b3e8403c905da79 | |
| parent | b46cf33ab8ce869af0f51c35026965d237d722c7 (diff) | |
| download | mariadb-git-f483d9a1260debb29680cc4e6fc09692b2c4403a.tar.gz | |
rocksdb: feature info incorrect when invalid zstd existsbb-10.3-danielblack-rocksdb-featureinfo
It could be possible that an invalid rocksdb version exists like
zstd < 1.1.2. So don't just report the feature enabled because
it wants to be, only if its valid.
| -rw-r--r-- | storage/rocksdb/build_rocksdb.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake index 0587e1ab2d3..6cfde4809cd 100644 --- a/storage/rocksdb/build_rocksdb.cmake +++ b/storage/rocksdb/build_rocksdb.cmake @@ -38,7 +38,7 @@ include(CheckFunctionExists) macro(check_lib package var) STRING(TOUPPER ${package} PACKAGE_NAME) SET(WITH_ROCKSDB_${package} AUTO CACHE STRING - "Build RocksDB with ${package} compression. Possible values are 'ON', 'OFF', 'AUTO' and default is 'AUTO'") + "Build RocksDB with ${package} compression. Possible values are 'ON', 'OFF', 'AUTO' and default is 'AUTO'") IF (NOT ${WITH_ROCKSDB_${package}} STREQUAL "OFF") FIND_PACKAGE(${package} QUIET) @@ -53,7 +53,7 @@ macro(check_lib package var) ENDIF() ENDIF() ENDIF() - ADD_FEATURE_INFO(ROCKSDB_${PACKAGE_NAME} HAVE_ROCKSDB_${PACKAGE_NAME} "${package} Compression in the RocksDB storage engine") + ADD_FEATURE_INFO(ROCKSDB_${PACKAGE_NAME} ${${var}_VALID} "${package} Compression in the RocksDB storage engine") IF(${${var}_VALID}) MESSAGE_ONCE(rocksdb_${var} "Found ${package}: ${${var}_LIBRARIES}") |