diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-09-15 10:04:49 +0000 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-09-15 10:04:49 +0000 |
| commit | 3fae64b196cfb94ac4084d02c5745285589c6b48 (patch) | |
| tree | bd96a225ab36cfde9b6f650f5d7d675baf9889f6 /storage/rocksdb/CMakeLists.txt | |
| parent | 43d5edf97c5f9e86173816c1837a1d01267c5165 (diff) | |
| download | mariadb-git-3fae64b196cfb94ac4084d02c5745285589c6b48.tar.gz | |
Copy of
commit 184a4a2d82f4f6f3cbcb1015bcdb32bebe73315c
Author: Abhinav Sharma <abhinavsharma@fb.com>
Date: Thu Sep 14 11:40:08 2017 -0700
Bump rocksdb submodule
Summary:
Bump rocksdb to include the fix for rocksdb.trx_info_rpl
The bug was introduced in: https://github.com/facebook/rocksdb/pull/2850
Fixed in: https://github.com/facebook/rocksdb/pull/2881
update-submodule: rocksdb
Reviewed By: lth
Differential Revision: D5834658
fbshipit-source-id: d1551bf
Diffstat (limited to 'storage/rocksdb/CMakeLists.txt')
| -rw-r--r-- | storage/rocksdb/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt index ec9705891e0..9e6c8160e32 100644 --- a/storage/rocksdb/CMakeLists.txt +++ b/storage/rocksdb/CMakeLists.txt @@ -106,6 +106,12 @@ IF (NOT "$ENV{WITH_ZSTD}" STREQUAL "") ADD_DEFINITIONS(-DZSTD) ENDIF() +IF (NOT "$ENV{WITH_TBB}" STREQUAL "") + SET(rocksdb_static_libs ${rocksdb_static_libs} + $ENV{WITH_TBB}/libtbb${PIC_EXT}.a) + ADD_DEFINITIONS(-DTBB) +ENDIF() + CHECK_INCLUDE_FILES(zlib.h HAVE_ZLIB_H) IF (HAVE_ZLIB_H) |