diff options
| author | Palmer <palmer@lindenlab.com> | 2009-11-18 12:02:04 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-11-18 12:02:04 -0800 |
| commit | 8b56d0bece83d5f30bc5abb4a4de07fa85585fb8 (patch) | |
| tree | 6d9c3e80daece23dd1bf66e5a90ef1b53c18f236 /indra/cmake | |
| parent | 1875d5e37ba1591ba9b75014a7618f38427f0d2f (diff) | |
| parent | 6b81dfb1398461f008ee7d590e9a14762859e916 (diff) | |
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/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) |