diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:57 -0400 |
| commit | 0c05c8c89632d2747ca8b364ff663d1d5505fb4d (patch) | |
| tree | 9f01f2c772212fcad555176a272265b5b4d67b09 /indra/cmake/GooglePerfTools.cmake | |
| parent | dff83a1ba0592049ccdcd31177c183d62df65e85 (diff) | |
| parent | ee9eef505279bf3983ec5fe4ce64ba3c38f0a76a (diff) | |
merge changes for storm-1117
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) |