From 144aeb56ca99b32e18df7ba352a8d29c8d3857a8 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Mon, 7 Jul 2008 21:57:50 +0000
Subject: [PATCH] Add support for GRID:STRING in cmake
---
indra/cmake/Variables.cmake | 2 ++
indra/newview/CMakeLists.txt | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index e537772fa5e..e3451b11340 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 46fb6a62465..b2f57c87132 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}
--
GitLab