summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-19 14:46:30 -0400
committerOz Linden <oz@lindenlab.com>2011-04-19 14:46:30 -0400
commit76f24589cd7168099cbffee358835e5489c961cf (patch)
tree7691d0cd2313a30a78c54d8392bdb3514b0e77af /indra
parent4ce6d2d909b2298f0165cb90247b3a59ab286c94 (diff)
parentd97f7e92fcd48a0e332265b21494028ed04a24a8 (diff)
merge up to latest viewer-development
Diffstat (limited to 'indra')
-rw-r--r--indra/cmake/Variables.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 77dd34d122..8c9c375790 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -135,6 +135,7 @@ set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for
set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside")
set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")
+set(UNATTENDED OFF CACHE BOOL "Should be set to ON for building with VC Express editions.")
if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics)
set(SERVER ON CACHE BOOL "Build Second Life server software.")