diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-04-21 11:44:48 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-04-21 11:44:48 -0700 |
| commit | 77791a88a9811f71cc9af668d28a903645436be0 (patch) | |
| tree | a3327810a1e9ac57681e9cf0fdc627dcd168a0a9 /indra/cmake | |
| parent | 970b3a7f28c2f1a611410cb8738d17800949b1bd (diff) | |
| parent | da3c0658de4b6e7ab645b718927e9b10fd612b01 (diff) | |
Merge madness
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/LLTestCommand.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/Variables.cmake | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/indra/cmake/LLTestCommand.cmake b/indra/cmake/LLTestCommand.cmake index 554559edbd..7e9854dc4c 100644 --- a/indra/cmake/LLTestCommand.cmake +++ b/indra/cmake/LLTestCommand.cmake @@ -1,3 +1,5 @@ +include(Python) + MACRO(LL_TEST_COMMAND OUTVAR LD_LIBRARY_PATH) # nat wonders how Kitware can use the term 'function' for a construct that # cannot return a value. And yet, variables you set inside a FUNCTION are 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.") |