diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-11 16:38:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-11 16:38:31 -0400 |
| commit | 3d8e99d4fb5586b93342534593bfb892161c7ae9 (patch) | |
| tree | 3dc46544c3482c43525723771a677e87ff61c211 /indra | |
| parent | f452138f29fa58f618a8f0be5346fc06035c5943 (diff) | |
| parent | 1bf7869b0b697c287820293ffce9cf64c380a80c (diff) | |
merge back late beta fix for storm-1060
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 7e1d46f0e8..328cbf3936 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1256,11 +1256,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}") |