From abdc99f21b542c4fea67030ddbd7166c9d1c6c63 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Wed, 18 Feb 2009 21:10:16 +0000
Subject: Merge of QAR-1267 to trunk.  This was a combo merge of QAR-1175
 (maint-render-9) and QAR-1236 (dll-msvcrt-2)

svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
---
 indra/cmake/GooglePerfTools.cmake | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/cmake/GooglePerfTools.cmake')

diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index 25e9f6d4f4..aff65cb53e 100644
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -5,6 +5,11 @@ if (STANDALONE)
   include(FindGooglePerfTools)
 else (STANDALONE)
   use_prebuilt_binary(google)
+  if (WINDOWS)
+    set(TCMALLOC_LIBRARIES 
+        debug libtcmalloc_minimal-debug
+        optimized libtcmalloc_minimal-debug)
+  endif (WINDOWS)
   if (LINUX)
     set(TCMALLOC_LIBRARIES tcmalloc)
     set(STACKTRACE_LIBRARIES stacktrace)
-- 
cgit v1.2.3