Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0

indra/cmake/GooglePerfTools.cmake

@@ -23,12 +23,11 @@ else (STANDALONE)
 endif (STANDALONE)
 
 if (GOOGLE_PERFTOOLS_FOUND)
-  set(USE_GOOGLE_PERFTOOLS ON CACHE BOOL "Build with Google PerfTools support.")
+  # XXX Disable temporarily, until we have compilation issues on 64-bit
+  # Etch sorted.
+  set(USE_GOOGLE_PERFTOOLS OFF CACHE BOOL "Build with Google PerfTools support.")
 endif (GOOGLE_PERFTOOLS_FOUND)
 
-# XXX Disable temporarily, until we have compilation issues on 64-bit
-# Etch sorted.
-set(USE_GOOGLE_PERFTOOLS OFF)
 if (WINDOWS)
     # *TODO -reenable this once we get server usage sorted out
     #set(USE_GOOGLE_PERFTOOLS ON)

indra/llcommon/CMakeLists.txt

@@ -9,6 +9,7 @@ include(Linking)
 include(Boost)
 include(Pth)
 include(LLSharedLibs)
+include(GooglePerfTools)
 include(Copy3rdPartyLibs)
 
 include_directories(
@@ -259,6 +260,7 @@ target_link_libraries(
     ${BOOST_PROGRAM_OPTIONS_LIBRARY}
     ${BOOST_REGEX_LIBRARY}
     ${PTH_LIBRARIES}
+    ${GOOGLE_PERFTOOLS_LIBRARIES}
     )
 
 add_dependencies(llcommon stage_third_party_libs)