From 36ec149bef65f735e7900b5054efcc60f4add8ca Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Wed, 2 Dec 2009 16:00:22 -0800
Subject: Removed libtcmalloc_minimal.dll from the default build. Reviewed by
 Palmer

---
 indra/cmake/Copy3rdPartyLibs.cmake | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 342accad7a..5a142f23c9 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -35,7 +35,6 @@ if(WINDOWS)
     set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
     set(debug_files
         openjpegd.dll
-        libtcmalloc_minimal-debug.dll
         libapr-1.dll
         libaprutil-1.dll
         libapriconv-1.dll
@@ -46,12 +45,16 @@ if(WINDOWS)
     set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
     set(release_files
         openjpeg.dll
-        libtcmalloc_minimal.dll
         libapr-1.dll
         libaprutil-1.dll
         libapriconv-1.dll
         )
 
+    if(USE_GOOGLE_PERFTOOLS)
+      set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll)
+      set(release_files ${release_files} libtcmalloc_minimal.dll)
+    endif(USE_GOOGLE_PERFTOOLS)
+
     if (FMOD_SDK_DIR)
         set(fmod_files fmod.dll)
     endif (FMOD_SDK_DIR)
-- 
cgit v1.2.3


From 67f11add9c2e05e1c86e30c44c94ee1b7d9205d0 Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Fri, 13 Nov 2009 20:30:54 -0500
Subject: Added a USE_PRECOMPILED_HEADER cmake variable (defaulted on) and
 disabled pch usage for test executables.  Reviewed by james and steve.

---
 indra/cmake/Variables.cmake | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/cmake')

diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index d4f9ed79de..db0b44eb8f 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -116,4 +116,7 @@ For more information, please see JIRA DEV-14943 - Cmake Linux cannot build both
   ")
 endif (LINUX AND SERVER AND VIEWER)
 
+
+set(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Enable use of precompiled header directives where supported.")
+
 source_group("CMake Rules" FILES CMakeLists.txt)
-- 
cgit v1.2.3