summaryrefslogtreecommitdiff
path: root/storage/rocksdb
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-07-05 14:23:23 +0200
committerSergei Golubchik <serg@mariadb.org>2018-08-12 11:37:43 +0200
commit97b563b5dbfce9dccf5a9e8204272e26d9e414a1 (patch)
treeadd5dbc7a08ba4f80a646f2bd44a0c27933b087e /storage/rocksdb
parent8ca2219065df5a829b9a802bbcc879b64e5cb904 (diff)
downloadmariadb-git-97b563b5dbfce9dccf5a9e8204272e26d9e414a1.tar.gz
less re-cmake messages
Diffstat (limited to 'storage/rocksdb')
-rw-r--r--storage/rocksdb/build_rocksdb.cmake5
1 files changed, 2 insertions, 3 deletions
diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
index 0f1b77e255d..8f1a89d3f9f 100644
--- a/storage/rocksdb/build_rocksdb.cmake
+++ b/storage/rocksdb/build_rocksdb.cmake
@@ -33,7 +33,7 @@ endif()
# Optional compression libraries.
-foreach(compression_lib LZ4 BZIP2 ZSTD snappy)
+foreach(compression_lib LZ4 BZIP2 zstd snappy)
FIND_PACKAGE(${compression_lib} QUIET)
SET(WITH_ROCKSDB_${compression_lib} AUTO CACHE STRING
@@ -76,7 +76,7 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD STREQUAL "OFF"))
if (ZSTD_VALID)
add_definitions(-DZSTD)
include_directories(${ZSTD_INCLUDE_DIR})
- list(APPEND THIRDPARTY_LIBS ${ZSTD_LIBRARY})
+ list(APPEND THIRDPARTY_LIBS ${ZSTD_LIBRARIES})
endif()
endif()
@@ -392,4 +392,3 @@ target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -frtti")
endif()
-