summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-11-18 11:59:09 -0800
committerPalmer <palmer@lindenlab.com>2009-11-18 11:59:09 -0800
commit6b81dfb1398461f008ee7d590e9a14762859e916 (patch)
treee8a276527ee7b240aa974b74feafa389176b2669 /indra/cmake
parentbe666bc14f7252b5cfa0b9c2e34f170f5e24c4d3 (diff)
Allow USE_GOOGLE_PERFTOOLS to be set to on. For memory manager
Reviewed by Bao
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/GooglePerfTools.cmake7
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index 355ecb58f0..946fc6b375 100644
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -23,12 +23,11 @@ else (STANDALONE)
endif (STANDALONE)
if (GOOGLE_PERFTOOLS_FOUND)
- set(USE_GOOGLE_PERFTOOLS ON CACHE BOOL "Build with Google PerfTools support.")
+ # XXX Disable temporarily, until we have compilation issues on 64-bit
+ # Etch sorted.
+ set(USE_GOOGLE_PERFTOOLS OFF CACHE BOOL "Build with Google PerfTools support.")
endif (GOOGLE_PERFTOOLS_FOUND)
-# XXX Disable temporarily, until we have compilation issues on 64-bit
-# Etch sorted.
-set(USE_GOOGLE_PERFTOOLS OFF)
if (WINDOWS)
# *TODO -reenable this once we get server usage sorted out
#set(USE_GOOGLE_PERFTOOLS ON)