diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2011-01-24 14:28:51 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2011-01-24 14:28:51 -0800 |
| commit | 1ba64d9b14d9247021a76d3cf983107812e9eb14 (patch) | |
| tree | aa3f59916a96e6fe21b92a3240a40b2484662e81 /indra/cmake/GooglePerfTools.cmake | |
| parent | de83bd5c6b1e103993ba74321d600f1c413785ce (diff) | |
| parent | 949ff3b10b28e4143f7c9ffb2c11d28cbf6ec522 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development
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) |