diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-19 16:14:19 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-19 16:14:19 +0200 |
commit | 5725b04b084f5ad2699e834421b12795af351975 (patch) | |
tree | 61c78a2a715717c172cc94f9fdd8bd80161991d7 /indra/cmake/GooglePerfTools.cmake | |
parent | 88cce61b09d225df0bcd8aab9dbd2c5a01ee7e19 (diff) | |
parent | 884a9887a7a9e833478d266ddf8a7808cdba2ae6 (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/cmake/GooglePerfTools.cmake')
-rw-r--r-- | indra/cmake/GooglePerfTools.cmake | 7 |
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) |