summaryrefslogtreecommitdiff
path: root/indra/cmake/GooglePerfTools.cmake
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-04-07 22:35:27 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-04-07 22:35:27 -0400
commit746633c6adfcde5b43ac578bede09bf7d05934e1 (patch)
tree49d9182789c9cf805969b3779408df55cb1e84b4 /indra/cmake/GooglePerfTools.cmake
parent94aa24a89ee96689633fad4e7250f6f81b6b76c1 (diff)
parent7054aaba6d6f044cd835e79e3be898d63ce96def (diff)
Merged BuildParams
Diffstat (limited to 'indra/cmake/GooglePerfTools.cmake')
-rw-r--r--indra/cmake/GooglePerfTools.cmake5
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)