Skip to content
Snippets Groups Projects
Commit 3d8e99d4 authored by Oz Linden's avatar Oz Linden
Browse files

merge back late beta fix for storm-1060

parents f452138f 1bf7869b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/CMakeLists.txt
+ 6
− 4
View file @ 3d8e99d4
...@@ -1256,11 +1256,13 @@ if (WINDOWS) ...@@ -1256,11 +1256,13 @@ if (WINDOWS)
# ('test' is the default) # ('test' is the default)
set(ICON_PATH "test") set(ICON_PATH "test")
string(TOLOWER ${VIEWER_CHANNEL} channel_lower) string(TOLOWER ${VIEWER_CHANNEL} channel_lower)
if(channel_lower MATCHES "^(release|development)") if(channel_lower MATCHES "^second life release")
set(ICON_PATH ${channel_lower}) set(ICON_PATH "release")
elseif(channel_lower MATCHES "^(beta.*)") elseif(channel_lower MATCHES "^second life beta viewer")
set(ICON_PATH "beta") 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") set(ICON_PATH "project")
endif() endif()
message("Copying icons for ${ICON_PATH}") message("Copying icons for ${ICON_PATH}")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment