summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-15 12:48:07 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-15 12:48:07 -0500
commite4a1b12e7a9c4bb8cbc2a1e41fddb8cec5a1b1e0 (patch)
treea74d7e087c6c440e31e319f76f90beb315a27617 /indra/cmake
parente68d5e248f73180def7c8928b32482347dd91de4 (diff)
SH-2789 WIP - build without tcmalloc, force alignment in various places
Diffstat (limited to 'indra/cmake')
-rwxr-xr-x[-rw-r--r--]indra/cmake/FindGooglePerfTools.cmake2
-rwxr-xr-x[-rw-r--r--]indra/cmake/GooglePerfTools.cmake2
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/cmake/FindGooglePerfTools.cmake b/indra/cmake/FindGooglePerfTools.cmake
index bb125d538e..1c785d3461 100644..100755
--- 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
index d9f91193be..2e96912769 100644..100755
--- 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)