diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2018-05-07 21:38:18 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2018-05-07 21:38:18 +0300 |
| commit | dbe73588cd82dc6b6547425e7233b7899f61dfd5 (patch) | |
| tree | b64bdea6c90446476d40fd8a477c522d2c499cea /storage/rocksdb/CMakeLists.txt | |
| parent | e44ca6cc9c300cbdf93c64110bd8cf2be8125379 (diff) | |
| parent | 03edf2ed04dbffe8c413fe0dd2715684e1627371 (diff) | |
| download | mariadb-git-dbe73588cd82dc6b6547425e7233b7899f61dfd5.tar.gz | |
Merge branch 'bb-10.2-mariarocks-merge' of github.com:MariaDB/server into 10.2
Manually resolved the conflicts
Diffstat (limited to 'storage/rocksdb/CMakeLists.txt')
| -rw-r--r-- | storage/rocksdb/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt index bf95201fb4b..7156150b042 100644 --- a/storage/rocksdb/CMakeLists.txt +++ b/storage/rocksdb/CMakeLists.txt @@ -95,6 +95,8 @@ SET(ROCKSDB_SE_SOURCES rdb_threads.h rdb_psi.h rdb_psi.cc + rdb_sst_info.cc + rdb_sst_info.h ) # MariaDB: the following is added in build_rocksdb.cmake, when appropriate: @@ -137,8 +139,6 @@ ADD_CONVENIENCE_LIBRARY(rocksdb_aux_lib event_listener.h rdb_perf_context.cc rdb_perf_context.h - rdb_sst_info.cc - rdb_sst_info.h rdb_buff.h rdb_mariadb_port.h ) @@ -178,9 +178,9 @@ IF(HAVE_SCHED_GETCPU) ADD_DEFINITIONS(-DHAVE_SCHED_GETCPU=1) ENDIF() -IF (NOT "$ENV{WITH_TBB}" STREQUAL "") +IF (WITH_TBB) SET(rocksdb_static_libs ${rocksdb_static_libs} - $ENV{WITH_TBB}/libtbb${PIC_EXT}.a) + ${WITH_TBB}/lib/libtbb${PIC_EXT}.a) ADD_DEFINITIONS(-DTBB) ENDIF() |