diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2020-06-22 14:39:15 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2020-07-28 10:49:47 +1000 |
| commit | cae4b3f8113f266b7b6636e222e9cd9df6080327 (patch) | |
| tree | f99d05abb0d5c8c3aa3619b109e9f2b497ab5cb3 /storage/rocksdb | |
| parent | 715beee46abb4c29bffd6f9c5fd5ee95da55bf4f (diff) | |
| download | mariadb-git-cae4b3f8113f266b7b6636e222e9cd9df6080327.tar.gz | |
rocksdb: FreeBSD disable jemalloc search
FreeBSD's inbuilt default jemalloc means its pointless
to do a package search on it. The paths are already set
by the system defaults.
Diffstat (limited to 'storage/rocksdb')
| -rw-r--r-- | storage/rocksdb/build_rocksdb.cmake | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake index adad1314594..6911b636996 100644 --- a/storage/rocksdb/build_rocksdb.cmake +++ b/storage/rocksdb/build_rocksdb.cmake @@ -18,17 +18,16 @@ if(WIN32) # include(${ROCKSDB_SOURCE_DIR}/thirdparty.inc) else() option(WITH_ROCKSDB_JEMALLOC "build RocksDB with JeMalloc" OFF) - if(WITH_ROCKSDB_JEMALLOC) - find_package(JeMalloc REQUIRED) - add_definitions(-DROCKSDB_JEMALLOC) - ADD_DEFINITIONS(-DROCKSDB_MALLOC_USABLE_SIZE) - include_directories(${JEMALLOC_INCLUDE_DIR}) - endif() if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") # FreeBSD has jemaloc as default malloc add_definitions(-DROCKSDB_JEMALLOC) ADD_DEFINITIONS(-DROCKSDB_MALLOC_USABLE_SIZE) set(WITH_JEMALLOC ON) + elseif(WITH_ROCKSDB_JEMALLOC) + find_package(JeMalloc REQUIRED) + add_definitions(-DROCKSDB_JEMALLOC) + ADD_DEFINITIONS(-DROCKSDB_MALLOC_USABLE_SIZE) + include_directories(${JEMALLOC_INCLUDE_DIR}) endif() endif() |