diff options
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/cmake/Copy3rdPartyLibs.cmake | 6 | ||||
| -rw-r--r-- | indra/cmake/GooglePerfTools.cmake | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index d4c478c3c7..38bfef6332 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -56,8 +56,8 @@ if(WINDOWS) )
if(USE_GOOGLE_PERFTOOLS)
- set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll)
- set(release_files ${release_files} libtcmalloc_minimal.dll)
+ set(debug_files ${debug_files} libtcmalloc-debug.dll)
+ set(release_files ${release_files} libtcmalloc.dll)
endif(USE_GOOGLE_PERFTOOLS)
if (FMOD)
@@ -262,7 +262,7 @@ elseif(LINUX) libopenal.so
libopenjpeg.so
libssl.so
- libtcmalloc_minimal.so
+ libtcmalloc.so
libuuid.so.16
libuuid.so.16.0.22
libssl.so.0.9.8
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 5f653c8fb3..b3d78919f2 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -7,14 +7,14 @@ else (STANDALONE) if (WINDOWS) use_prebuilt_binary(tcmalloc) set(TCMALLOC_LIBRARIES - debug libtcmalloc_minimal-debug - optimized libtcmalloc_minimal) + debug libtcmalloc-debug + optimized libtcmalloc) set(GOOGLE_PERFTOOLS_FOUND "YES") endif (WINDOWS) if (LINUX) use_prebuilt_binary(tcmalloc) set(TCMALLOC_LIBRARIES - tcmalloc_minimal) + tcmalloc) set(PROFILER_LIBRARIES profiler) set(GOOGLE_PERFTOOLS_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) |