diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-21 09:31:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-21 09:31:49 -0400 |
| commit | 9d2f08427b6f3643f642e3e599a19a2dce3101e7 (patch) | |
| tree | 529ff1ed1ac9961ec86f76ec51a6e92e931a64f9 /indra/cmake/GooglePerfTools.cmake | |
| parent | df63c6931e81c034887611711095e3134b9a7318 (diff) | |
| parent | 819c7f0dd21b8b819cdc70686682e31cadf155d6 (diff) | |
pull updates to the start of 2.6.2 from viewer-development
Diffstat (limited to 'indra/cmake/GooglePerfTools.cmake')
| -rw-r--r-- | indra/cmake/GooglePerfTools.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 946fc6b375..6c784a3a76 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -4,7 +4,6 @@ include(Prebuilt) if (STANDALONE) include(FindGooglePerfTools) else (STANDALONE) - use_prebuilt_binary(google) if (WINDOWS) use_prebuilt_binary(google-perftools) set(TCMALLOC_LIBRARIES @@ -13,11 +12,11 @@ else (STANDALONE) set(GOOGLE_PERFTOOLS_FOUND "YES") endif (WINDOWS) if (LINUX) + 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}/${LL_ARCH_DIR}/include) + ${LIBS_PREBUILT_DIR}/include) set(GOOGLE_PERFTOOLS_FOUND "YES") endif (LINUX) endif (STANDALONE) |