summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-08-15 14:51:21 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-08-15 14:51:21 -0400
commit832d972fe86325bfafad542c7c548dbecaf5ee65 (patch)
tree85d0a25e92646ebbc8f0cf5ee02da13573334233 /indra/newview/CMakeLists.txt
parent5c0df02df5abdadbf17235ae5d7208963c25f1ce (diff)
parentb21e63cc1260b1b8db87f52fb9b7a2f80b055327 (diff)
merge
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rw-r--r--indra/newview/CMakeLists.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index da3778d4bb..ef6cb244bb 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1258,11 +1258,13 @@ if (WINDOWS)
# ('test' is the default)
set(ICON_PATH "test")
string(TOLOWER ${VIEWER_CHANNEL} channel_lower)
- if(channel_lower MATCHES "^(release|development)")
- set(ICON_PATH ${channel_lower})
- elseif(channel_lower MATCHES "^(beta.*)")
+ if(channel_lower MATCHES "^second life release")
+ set(ICON_PATH "release")
+ elseif(channel_lower MATCHES "^second life beta viewer")
set(ICON_PATH "beta")
- elseif(channel_lower MATCHES "^(project.*)")
+ elseif(channel_lower MATCHES "^second life development")
+ set(ICON_PATH "development")
+ elseif(channel_lower MATCHES "project")
set(ICON_PATH "project")
endif()
message("Copying icons for ${ICON_PATH}")