diff options
| author | simon <none@none> | 2014-07-07 14:49:45 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-07-07 14:49:45 -0700 |
| commit | 3e6698073cedc8b24068147cf6b7091f081ea125 (patch) | |
| tree | 59d8759c554af8a733668dae9668ca6fd92bf820 /indra/cmake/GooglePerfTools.cmake | |
| parent | 770a0a2dea0bd503f88b35d3d440208bcd303e54 (diff) | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
Merge viewer-release and become version 3.7.12
Diffstat (limited to 'indra/cmake/GooglePerfTools.cmake')
| -rwxr-xr-x | indra/cmake/GooglePerfTools.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index f3fd008e49..c1faeb9325 100755 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -5,9 +5,9 @@ include(Prebuilt) # set ON or OFF as desired. set (USE_TCMALLOC OFF) -if (STANDALONE) +if (USESYSTEMLIBS) include(FindGooglePerfTools) -else (STANDALONE) +else (USESYSTEMLIBS) if (WINDOWS) if (USE_TCMALLOC) use_prebuilt_binary(gperftools) @@ -34,7 +34,7 @@ else (STANDALONE) ${LIBS_PREBUILT_DIR}/include) set(GOOGLE_PERFTOOLS_FOUND "YES") endif (LINUX) -endif (STANDALONE) +endif (USESYSTEMLIBS) if (GOOGLE_PERFTOOLS_FOUND) # XXX Disable temporarily, until we have compilation issues on 64-bit |