From: Kefu Chai <kchai@redhat.com>
Date: Wed, 8 Jun 2016 03:34:44 +0000 (+0800)
Subject: cmake: always set ALLOCATOR at configure time
X-Git-Tag: v11.0.0~267^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=48a1f8eff5bd753c942a0f9a1d45f342254daa92;p=ceph.git

cmake: always set ALLOCATOR at configure time

so it would be easier to figure out what allocator we are using later,
instead of poking around ${Foo}_FOUND variables.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7af5d45386af..3bd8a9955d27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -268,7 +268,11 @@ else(ALLOCATOR)
     find_package(JeMalloc)
     set(HAVE_LIBJEMALLOC ${JEMALLOC_FOUND})
   endif(NOT ${Tcmalloc_FOUND})
-  if(NOT Tcmalloc_FOUND AND NOT JEMALLOC_FOUND)
+  if(Tcmalloc_FOUND)
+    set(ALLOCATOR tcmalloc)
+  elseif(JEMALLOC_FOUND)
+    set(ALLOCATOR jemalloc)
+  else()
     message(WARNING "tcmalloc and jemalloc not found, falling back to libc")
     set(ALLOCATOR "libc")
   endif(NOT Tcmalloc_FOUND AND NOT JEMALLOC_FOUND)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f34b1b6f09f2..cb2ff98f3699 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -235,15 +235,15 @@ if(HAVE_XIO)
 endif(HAVE_XIO)
 
 # sort out which allocator to use
-if(Tcmalloc_FOUND)
+if(ALLOCATOR STREQUAL "tcmalloc")
   set(ALLOC_LIBS tcmalloc)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free")
   set(TCMALLOC_srcs perfglue/heap_profiler.cc)
-elseif(NOT Tcmalloc_FOUND AND JEMALLOC_FOUND)
+elseif(ALLOCATOR STREQUAL "jemalloc")
   set(ALLOC_LIBS jemalloc)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free")
   set(TCMALLOC_srcs perfglue/disabled_heap_profiler.cc)
-elseif(${ALLOCATOR} STREQUAL "libc")
+elseif(ALLOCATOR STREQUAL "libc")
   set(TCMALLOC_srcs perfglue/disabled_heap_profiler.cc)
 endif()