diff options
| author | Don Kjer <don@lindenlab.com> | 2011-04-01 23:37:30 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-04-01 23:37:30 +0000 |
| commit | d292053c04e6adfd48be0484dd5a8a07b48e0541 (patch) | |
| tree | bb8814069df178e2bcae041f2c3e9b11338492db /indra/cmake/GooglePerfTools.cmake | |
| parent | f2bb81d17660054697ed984afc0e3f8d90f77eda (diff) | |
| parent | 1664c9dc678f7aca9c2bbf38d28e00550e03c4dd (diff) | |
Merge with 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) |