diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-07-31 22:59:58 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-07-31 22:59:58 +0200 |
| commit | 7841a7eb09208f52fcbab7e80e38c7ca29b1339e (patch) | |
| tree | 7f9c4d80d3b86a33c54ff0090865ada4d4ed577d /storage/rocksdb | |
| parent | 77992bc710bbc16798c12da7081769817f87791a (diff) | |
| parent | 1423cf5e3dcb3c50047f086a5933fe77006cf242 (diff) | |
| download | mariadb-git-7841a7eb09208f52fcbab7e80e38c7ca29b1339e.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'storage/rocksdb')
| -rw-r--r-- | storage/rocksdb/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/rocksdb/build_rocksdb.cmake | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt index 931aaeb5c64..5dfd94c6212 100644 --- a/storage/rocksdb/CMakeLists.txt +++ b/storage/rocksdb/CMakeLists.txt @@ -2,6 +2,7 @@ MACRO(SKIP_ROCKSDB_PLUGIN msg) MESSAGE_ONCE(SKIP_ROCKSDB_PLUGIN "Can't build rocksdb engine - ${msg}") + ADD_FEATURE_INFO(ROCKSDB "OFF" "Storage Engine") RETURN() ENDMACRO() diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake index 5f1566edcf5..e23862ee659 100644 --- a/storage/rocksdb/build_rocksdb.cmake +++ b/storage/rocksdb/build_rocksdb.cmake @@ -42,6 +42,7 @@ macro(check_lib package var) IF (NOT ${WITH_ROCKSDB_${package}} STREQUAL "OFF") FIND_PACKAGE(${package} QUIET) + SET(HAVE_ROCKSDB_${PACKAGE_NAME} TRUE) IF (${${PACKAGE_NAME}_FOUND}) IF(${ARGC} GREATER 2) SET(CMAKE_REQUIRED_LIBRARIES ${${var}_LIBRARIES}) @@ -52,6 +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") IF(${${var}_VALID}) MESSAGE_ONCE(rocksdb_${var} "Found ${package}: ${${var}_LIBRARIES}") @@ -78,6 +80,7 @@ check_lib(ZSTD ZSTD ZDICT_trainFromBuffer) add_definitions(-DZLIB) list(APPEND THIRDPARTY_LIBS ${ZLIB_LIBRARY}) +ADD_FEATURE_INFO(ROCKSDB_ZLIB "ON" "zlib Compression in the RocksDB storage engine") if(CMAKE_SYSTEM_NAME MATCHES "Cygwin") add_definitions(-fno-builtin-memcmp -DCYGWIN) |