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: Add support for GRID:STRING in cmake

---
 indra/newview/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

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}
-- 
cgit v1.2.3