From 0e2df0277510fc05d6038838ddf283dbd2e5124e Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 11 Apr 2011 15:42:17 -0500
Subject: Attempt at making tcmalloc work.
---
indra/cmake/Copy3rdPartyLibs.cmake | 6 +++---
indra/cmake/GooglePerfTools.cmake | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 38bfef6332..d4c478c3c7 100755
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -56,8 +56,8 @@ if(WINDOWS)
)
if(USE_GOOGLE_PERFTOOLS)
- set(debug_files ${debug_files} libtcmalloc-debug.dll)
- set(release_files ${release_files} libtcmalloc.dll)
+ set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll)
+ set(release_files ${release_files} libtcmalloc_minimal.dll)
endif(USE_GOOGLE_PERFTOOLS)
if (FMOD)
@@ -262,7 +262,7 @@ elseif(LINUX)
libopenal.so
libopenjpeg.so
libssl.so
- libtcmalloc.so
+ libtcmalloc_minimal.so
libuuid.so.16
libuuid.so.16.0.22
libssl.so.0.9.8
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index b3d78919f2..8740e36753 100644
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -7,8 +7,8 @@ else (STANDALONE)
if (WINDOWS)
use_prebuilt_binary(tcmalloc)
set(TCMALLOC_LIBRARIES
- debug libtcmalloc-debug
- optimized libtcmalloc)
+ debug libtcmalloc_minimal-debug
+ optimized libtcmalloc_minimal)
set(GOOGLE_PERFTOOLS_FOUND "YES")
endif (WINDOWS)
if (LINUX)
--
cgit v1.2.3