diff options
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 4 | ||||
| -rw-r--r-- | indra/cmake/GooglePerfTools.cmake | 3 | 
2 files changed, 3 insertions, 4 deletions
| diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index f1584ff0c4..e2b7d3b888 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -257,9 +257,9 @@ elseif(LINUX)          libopenal.so          libopenjpeg.so          libssl.so -        libstacktrace.so          libtcmalloc.so -        libuuid.so.1 +        libuuid.so.16 +        libuuid.so.16.0.22          libssl.so.0.9.8          libfontconfig.so.1.4.4         ) diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 133ae14d2f..6c784a3a76 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -12,9 +12,8 @@ else (STANDALONE)      set(GOOGLE_PERFTOOLS_FOUND "YES")    endif (WINDOWS)    if (LINUX) -    use_prebuilt_binary(google) +    use_prebuilt_binary(google-perftools)      set(TCMALLOC_LIBRARIES tcmalloc) -    set(STACKTRACE_LIBRARIES stacktrace)      set(PROFILER_LIBRARIES profiler)      set(GOOGLE_PERFTOOLS_INCLUDE_DIR          ${LIBS_PREBUILT_DIR}/include) | 
