diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-07-09 15:22:12 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-07-09 15:22:12 -0700 |
| commit | 487fce4afaed69268db4fb996e420ba8984101d3 (patch) | |
| tree | 365a4d16f511c083334b5315c6ffc882c558a300 /indra/cmake/GooglePerfTools.cmake | |
| parent | e414dfad51b3747fa20c0023820980f23f1cad2c (diff) | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
Merge with 3.7.11-release
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 |