diff options
| author | Palmer <palmer@lindenlab.com> | 2009-11-18 13:06:28 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-11-18 13:06:28 -0800 |
| commit | becfbd2b8295e3007fe151cd9b69d0af139040e2 (patch) | |
| tree | b45768079da7e69cb4ad45880fa091c0b6f98041 | |
| parent | 3ac552c5048c13bc2912d25877728a057b195300 (diff) | |
| parent | 8b56d0bece83d5f30bc5abb4a4de07fa85585fb8 (diff) | |
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
| -rw-r--r-- | indra/cmake/GooglePerfTools.cmake | 7 | ||||
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 355ecb58f0..946fc6b375 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/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) diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index e41c75846b..416303342a 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/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) |