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 7af5d45386af4dc0f1fbb9eadf66f7051cecdf81..3bd8a9955d27588b5d5d84ea1b989142445dc5c1 100644 (file)
--- 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 f34b1b6f09f2b729ee8a3755236792b6e316c378..cb2ff98f3699231b3da084493b1c20e07478d5b7 100644 (file)
--- 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()