diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2018-08-28 14:09:04 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2018-08-28 14:09:04 +0300 |
| commit | c930afd47eb68aaa5a6a1000969cef881d3fbb0b (patch) | |
| tree | 9a4eec877a555b32d0fa3edae0052ffd97c5bfe8 /storage/rocksdb/CMakeLists.txt | |
| parent | 55163ba1bdb1a05daadc66c41c959994231b361c (diff) | |
| parent | faa4d8f8c6c12c09541c4733773ac700c5e643cf (diff) | |
| download | mariadb-git-c930afd47eb68aaa5a6a1000969cef881d3fbb0b.tar.gz | |
Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-mariarocks-merge
Move up-to this revision in the upstream:
commit de1e8c7bfe7c875ea284b55040e8f3cd3a56fcc2
Author: Abhinav Sharma <abhinavsharma@fb.com>
Date: Thu Aug 23 14:34:39 2018 -0700
Log updates to semi-sync whitelist in the error log
Summary:
Plugin variable changes are not logged in the error log even when
log_global_var_changes is enabled. Logging updates to whitelist will help in
debugging.
Reviewed By: guokeno0
Differential Revision: D9483807
fbshipit-source-id: e111cda773d
Diffstat (limited to 'storage/rocksdb/CMakeLists.txt')
| -rw-r--r-- | storage/rocksdb/CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt index 2a4ea4dfc0f..2689dc7151c 100644 --- a/storage/rocksdb/CMakeLists.txt +++ b/storage/rocksdb/CMakeLists.txt @@ -155,6 +155,9 @@ if (UNIX AND NOT APPLE) endif() TARGET_LINK_LIBRARIES(rocksdb rocksdb_aux_lib) + FIND_LIBRARY(LZ4_LIBRARY + NAMES liblz4${PIC_EXT}.a lz4 + HINTS ${WITH_LZ4}/lib) IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") @@ -182,8 +185,11 @@ IF(HAVE_SCHED_GETCPU) ENDIF() IF (WITH_TBB) + FIND_LIBRARY(TBB_LIBRARY + NAMES libtbb${PIC_EXT}.a tbb + HINTS ${WITH_TBB}/lib) SET(rocksdb_static_libs ${rocksdb_static_libs} - ${WITH_TBB}/lib/libtbb${PIC_EXT}.a) + ${TBB_LIBRARY}) ADD_DEFINITIONS(-DTBB) ENDIF() |