diff options
author | Oz Linden <oz@lindenlab.com> | 2014-04-22 16:03:35 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-04-22 16:03:35 -0400 |
commit | d00d37d23b68037fed8eeeffe21a87f7597086c3 (patch) | |
tree | 2ce3ca6ce4038ab967277ebba1ca4b8a599c50e5 /indra/cmake/GooglePerfTools.cmake | |
parent | 6c8bddca3d5a790934535fdd6f176e28d181d76a (diff) | |
parent | 776aadf4ef65681084268c3866058172c89b4259 (diff) |
merge changes for OPEN-199
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 |