diff options
| author | Christian Goetze <cg@lindenlab.com> | 2008-07-07 21:57:50 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2008-07-07 21:57:50 +0000 |
| commit | 144aeb56ca99b32e18df7ba352a8d29c8d3857a8 (patch) | |
| tree | ee9051dd3c930b084f0dc42067d17e1f738424f6 /indra | |
| parent | 596f6b57e2afbbe3728475fb7c101a5ee52115fa (diff) | |
Add support for GRID:STRING in cmake
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Variables.cmake | 2 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index e537772fa5..e3451b1134 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -75,6 +75,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(LL_ARCH_DIR universal-darwin) endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +# Default deploy grid +set(GRID agni CACHE STRING "Target Grid") set(VIEWER ON CACHE BOOL "Build Second Life viewer.") diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 46fb6a6246..b2f57c8713 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1325,6 +1325,7 @@ if (WINDOWS) ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py --configuration=${CMAKE_CFG_INTDIR} --channel=${VIEWER_CHANNEL} + --grid=${GRID} --source=${CMAKE_CURRENT_SOURCE_DIR} --artwork=${ARTWORK_DIR} --build=${CMAKE_CURRENT_BINARY_DIR} @@ -1411,7 +1412,7 @@ if (LINUX) COMMAND ${PYTHON_EXECUTABLE} ARGS ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py - --grid=agni + --grid=${GRID} --channel=${VIEWER_CHANNEL} --installer_name=${product} --arch=${ARCH} @@ -1450,6 +1451,7 @@ if (DARWIN) COMMAND ${PYTHON_EXECUTABLE} ARGS ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py + --grid=${GRID} --actions=copy --configuration=${CMAKE_CFG_INTDIR} --source=${CMAKE_CURRENT_SOURCE_DIR} @@ -1464,6 +1466,7 @@ if (DARWIN) COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py + --grid=${GRID} --configuration=${CMAKE_CFG_INTDIR} --channel=${VIEWER_CHANNEL} --source=${CMAKE_CURRENT_SOURCE_DIR} |