diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-25 17:11:56 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-25 17:11:56 -0500 |
| commit | 8b2b0ba2df1f21490f6cf454a5f62cf5f7b4f833 (patch) | |
| tree | 3fefa4114242238bbc97bd16c506ee9e9e405e07 /indra/cmake/GooglePerfTools.cmake | |
| parent | 714ba52df0397b58769e02ae9a7d9877a4505d34 (diff) | |
| parent | 93138ec2cbd5a9707a7ade1acc6ef35fbc50b422 (diff) | |
Automated merge with file:///Users/oz/Work/V-D
Diffstat (limited to 'indra/cmake/GooglePerfTools.cmake')
| -rw-r--r-- | indra/cmake/GooglePerfTools.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 946fc6b375..133ae14d2f 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,12 @@ else (STANDALONE) set(GOOGLE_PERFTOOLS_FOUND "YES") endif (WINDOWS) if (LINUX) + use_prebuilt_binary(google) 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) |