summaryrefslogtreecommitdiff
path: root/indra/cmake/LLCommon.cmake
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-01-09 16:39:30 -0500
committerMonty Brandenberg <monty@lindenlab.com>2013-01-09 16:39:30 -0500
commitcc0a4bf6acafe759baaccea65022c963373ea012 (patch)
treed4fe1f1e34b1ab0d140a37c1f80d09034824d3e8 /indra/cmake/LLCommon.cmake
parent11e506f2eb979a5ddfc3ca6f9c626771ab012a78 (diff)
parentcdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff)
Merge. Pull viewer-development in prior to filing DRTVWR merge request.
Diffstat (limited to 'indra/cmake/LLCommon.cmake')
-rw-r--r--indra/cmake/LLCommon.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index 8f7bb296ce..c254bf6f05 100644
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -22,7 +22,7 @@ else (LINUX)
set(LLCOMMON_LIBRARIES llcommon)
endif (LINUX)
-add_definitions(${TCMALLOC_FLAG})
+# add_definitions(${TCMALLOC_FLAG})
set(LLCOMMON_LINK_SHARED OFF CACHE BOOL "Build the llcommon target as a static library.")
if(LLCOMMON_LINK_SHARED)