diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-06 07:29:30 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-06 07:29:30 -0500 |
| commit | 111e915a91ff5431d215312c8659518f5f149555 (patch) | |
| tree | edfdedfa7a5884f9405aad9a143de234e4f4bc97 /indra/cmake/GooglePerfTools.cmake | |
| parent | 09b009fc23e75c8403cc9879f7f839d9e2656c02 (diff) | |
| parent | f59b065a973c88c09da5a86bbcfb7e4175148532 (diff) | |
merge to latest 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) |