diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-03-13 16:38:00 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-03-13 16:38:00 -0400 |
| commit | 66de0c9965ff68bcb8cb60975fcffa45e2c6d74c (patch) | |
| tree | e3fa6c87fe70e487b6fc6e94f6793b7638b568ea /indra/cmake/LLCommon.cmake | |
| parent | 49e114748fdb52599aaa141c2006198c48aa083b (diff) | |
| parent | 17c8eadb3d89bc78019f0b50eb8b109f25616781 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/cmake/LLCommon.cmake')
| -rw-r--r-- | indra/cmake/LLCommon.cmake | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake index b50b4bcdb2..3e29297c58 100644 --- a/indra/cmake/LLCommon.cmake +++ b/indra/cmake/LLCommon.cmake @@ -4,7 +4,6 @@ include(APR) include(Boost) include(EXPAT) include(ZLIB) -include(GooglePerfTools) set(LLCOMMON_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llcommon @@ -34,8 +33,6 @@ else (LINUX) ${BOOST_SYSTEM_LIBRARY} ) endif (LINUX) -# add_definitions(${TCMALLOC_FLAG}) - set(LLCOMMON_LINK_SHARED OFF CACHE BOOL "Build the llcommon target as a static library.") if(LLCOMMON_LINK_SHARED) add_definitions(-DLL_COMMON_LINK_SHARED=1) |