From: Kefu Chai <tchaikov@gmail.com>
Date: Wed, 8 Aug 2018 16:46:53 +0000 (+0800)
Subject: Merge pull request #23441 from tchaikov/wip-cmake-rocksdb-cleanup
X-Git-Tag: v14.0.1~640
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=72cc4cedd44339a517d59c183457e28cb40dedfd;p=ceph.git

Merge pull request #23441 from tchaikov/wip-cmake-rocksdb-cleanup

cmake: rocksdb related cleanup

Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

72cc4cedd44339a517d59c183457e28cb40dedfd
diff --cc CMakeLists.txt
index 67d258f21ad71,3709830d13272..dcd6ee393578e
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -314,9 -314,17 +314,13 @@@ if(WITH_LZ4
  endif(WITH_LZ4)
  
  #if allocator is set on command line make sure it matches below strings
+ set(ALLOCATOR "" CACHE STRING
+   "specify memory allocator to use. currently tcmalloc, tcmalloc_minimal, \
+ jemalloc, and libc is supported. if not specified, will try to find tcmalloc, \
+ and then jemalloc. If neither of then is found. use the one in libc.")
  if(ALLOCATOR)
    if(${ALLOCATOR} MATCHES "tcmalloc(_minimal)?")
 -    if(GPERFTOOLS_USE_STATIC_LIBS)
 -      include(Buildgperftools)
 -    else()
 -      find_package(gperftools REQUIRED)
 -    endif()
 +    find_package(gperftools REQUIRED)
      set(HAVE_LIBTCMALLOC ON)
    elseif(${ALLOCATOR} STREQUAL "jemalloc")
      find_package(JeMalloc REQUIRED)