From e4a1b12e7a9c4bb8cbc2a1e41fddb8cec5a1b1e0 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 15 Dec 2011 12:48:07 -0500
Subject: SH-2789 WIP - build without tcmalloc, force alignment in various
 places

---
 indra/cmake/FindGooglePerfTools.cmake | 2 ++
 indra/cmake/GooglePerfTools.cmake     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 indra/cmake/FindGooglePerfTools.cmake
 mode change 100644 => 100755 indra/cmake/GooglePerfTools.cmake

(limited to 'indra/cmake')

diff --git a/indra/cmake/FindGooglePerfTools.cmake b/indra/cmake/FindGooglePerfTools.cmake
old mode 100644
new mode 100755
index bb125d538e..1c785d3461
--- a/indra/cmake/FindGooglePerfTools.cmake
+++ b/indra/cmake/FindGooglePerfTools.cmake
@@ -64,3 +64,5 @@ MARK_AS_ADVANCED(
   PROFILER_LIBRARY
   GOOGLE_PERFTOOLS_INCLUDE_DIR
   )
+
+SET(GOOGLE_PERFTOOLS_FOUND "NO")
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
old mode 100644
new mode 100755
index d9f91193be..2e96912769
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -29,7 +29,7 @@ if (GOOGLE_PERFTOOLS_FOUND)
 endif (GOOGLE_PERFTOOLS_FOUND)
 
 if (WINDOWS)
-    set(USE_GOOGLE_PERFTOOLS ON)
+   set(USE_GOOGLE_PERFTOOLS OFF)
 endif (WINDOWS)
 
 if (USE_GOOGLE_PERFTOOLS)
-- 
cgit v1.2.3