diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-20 18:46:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-20 18:46:54 -0500 |
| commit | ad3dd05f4aea5db735b1c21bfccb34625a03f11d (patch) | |
| tree | 8058c31f361df612c588aaf8b92b0f55a5aa3f21 /indra/cmake/GooglePerfTools.cmake | |
| parent | a6592b783628eb1c5ab2d51b66cd98399c0e88cc (diff) | |
| parent | c42ed54b0a532cb4e0ad30a1b0b5038cef9938f2 (diff) | |
merge
Diffstat (limited to 'indra/cmake/GooglePerfTools.cmake')
| -rw-r--r-- | indra/cmake/GooglePerfTools.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 946fc6b375..ee231dcde6 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -6,7 +6,7 @@ if (STANDALONE) else (STANDALONE) use_prebuilt_binary(google) if (WINDOWS) - use_prebuilt_binary(google-perftools) + use_prebuilt_binary(tcmalloc) set(TCMALLOC_LIBRARIES debug libtcmalloc_minimal-debug optimized libtcmalloc_minimal) @@ -29,8 +29,7 @@ if (GOOGLE_PERFTOOLS_FOUND) endif (GOOGLE_PERFTOOLS_FOUND) if (WINDOWS) - # *TODO -reenable this once we get server usage sorted out - #set(USE_GOOGLE_PERFTOOLS ON) + set(USE_GOOGLE_PERFTOOLS ON) endif (WINDOWS) if (USE_GOOGLE_PERFTOOLS) |