From f4f4a39c01692e100d8ef55f33675a570826b1ba Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Thu, 24 Oct 2013 09:53:51 +0200 Subject: [PATCH] Revert accidental removal of tcmalloc for 32 bit --- indra/cmake/GooglePerfTools.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index de669ce08..d92c39ded 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -12,10 +12,10 @@ else (STANDALONE) if (LINUX OR WINDOWS AND NOT WORD_SIZE EQUAL 64) use_prebuilt_binary(gperftools) endif (LINUX OR WINDOWS AND NOT WORD_SIZE EQUAL 64) - if (WINDOWS AND NOT DISABLE_TCMALLOC AND USE_GOOGLE_PERFTOOLS) + if (WINDOWS AND NOT DISABLE_TCMALLOC) set(TCMALLOC_LIBRARIES libtcmalloc_minimal.lib) set(TCMALLOC_LINKER_FLAGS "/INCLUDE:\"__tcmalloc\"") - endif (WINDOWS AND NOT DISABLE_TCMALLOC AND USE_GOOGLE_PERFTOOLS) + endif (WINDOWS AND NOT DISABLE_TCMALLOC) if (LINUX) if(USE_GOOGLE_PERFTOOLS) set(TCMALLOC_LIBRARIES tcmalloc)