summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-08-22 08:46:19 -0400
committerOz Linden <oz@lindenlab.com>2012-08-22 08:46:19 -0400
commit63d04204a99802d3200452e101d9bb1b898be881 (patch)
tree457b4b2336afd03f982ff04b7340ec5cb8dfcda4 /indra/cmake
parent5949d605d757c97819b7b55d1860d36031a3d38f (diff)
parente0f391df2a95192130bdfeb0d4f03ad6ca489eef (diff)
merge changes for DRTVWR-203
Diffstat (limited to 'indra/cmake')
-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 00baf626d2..487b581056 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 "")