From b27e0e08f07f84e9143f51a22752ee384eedfa72 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Tue, 15 Jul 2008 01:34:41 +0000
Subject: [PATCH] Add code to support add_viewer_version_to_manager
---
indra/cmake/Variables.cmake | 3 ++-
indra/newview/CMakeLists.txt | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index e3451b11340..5868e4d07e0 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -79,7 +79,8 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(GRID agni CACHE STRING "Target Grid")
set(VIEWER ON CACHE BOOL "Build Second Life viewer.")
-
+set(VIEWER_CHANNEL "Developer" CACHE STRING "Viewer Channel Name")
+set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing")
set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index b2f57c87132..12085ee77ea 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}
+ --login_channel=${VIEWER_CHANNEL}
--grid=${GRID}
--source=${CMAKE_CURRENT_SOURCE_DIR}
--artwork=${ARTWORK_DIR}
@@ -1381,8 +1382,6 @@ build_version(viewer)
set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
"Path to artwork files.")
-set(VIEWER_CHANNEL "Developer" CACHE STRING
- "The name of the channel to use.")
if (LINUX)
add_custom_command(
@@ -1414,6 +1413,7 @@ if (LINUX)
${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
--grid=${GRID}
--channel=${VIEWER_CHANNEL}
+ --login_channel=${VIEWER_CHANNEL}
--installer_name=${product}
--arch=${ARCH}
--source=${CMAKE_CURRENT_SOURCE_DIR}
@@ -1469,6 +1469,7 @@ if (DARWIN)
--grid=${GRID}
--configuration=${CMAKE_CFG_INTDIR}
--channel=${VIEWER_CHANNEL}
+ --login_channel=${VIEWER_CHANNEL}
--source=${CMAKE_CURRENT_SOURCE_DIR}
--artwork=${ARTWORK_DIR}
--build=${CMAKE_CURRENT_BINARY_DIR}
--
GitLab