summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-19 12:34:03 -0400
committerOz Linden <oz@lindenlab.com>2012-06-19 12:34:03 -0400
commitd1ac85a589f92981b8031140997a21df633136e2 (patch)
treeb0854607738d5ffb86b9de8c20cc946433a15c09 /indra
parent84574fe30a4cb2a8822d01a5f958a005bb9d8234 (diff)
parent361a413d25509e0055b5f0dbaae7a5a50264a84f (diff)
merge changes for open-142
Diffstat (limited to 'indra')
-rw-r--r--indra/cmake/00-Common.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 98eeed09b3..303f7e5608 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -51,6 +51,7 @@ if (WINDOWS)
set(CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /Ob2 -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
CACHE STRING "C++ compiler release options" FORCE)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
set(CMAKE_CXX_STANDARD_LIBRARIES "")
set(CMAKE_C_STANDARD_LIBRARIES "")