Skip to content
Snippets Groups Projects
Commit 45858554 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix channel-based icon copying

parent 83baa305
No related branches found
No related tags found
No related merge requests found
...@@ -1516,13 +1516,13 @@ if (WINDOWS) ...@@ -1516,13 +1516,13 @@ if (WINDOWS)
set(ICON_PATH "test") set(ICON_PATH "test")
set(VIEWER_MACOSX_PHASE "d") set(VIEWER_MACOSX_PHASE "d")
string(TOLOWER ${VIEWER_CHANNEL} channel_lower) string(TOLOWER ${VIEWER_CHANNEL} channel_lower)
if(channel_lower MATCHES "^second life release") if(channel_lower MATCHES "^alchemy release")
set(ICON_PATH "release") set(ICON_PATH "release")
set(VIEWER_MACOSX_PHASE "f") set(VIEWER_MACOSX_PHASE "f")
elseif(channel_lower MATCHES "^second life beta") elseif(channel_lower MATCHES "^alchemy beta")
set(ICON_PATH "beta") set(ICON_PATH "beta")
set(VIEWER_MACOSX_PHASE "b") set(VIEWER_MACOSX_PHASE "b")
elseif(channel_lower MATCHES "^second life project") elseif(channel_lower MATCHES "^alchemy project")
set(ICON_PATH "project") set(ICON_PATH "project")
set(VIEWER_MACOSX_PHASE "a") set(VIEWER_MACOSX_PHASE "a")
endif() endif()
...@@ -2081,7 +2081,7 @@ set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH ...@@ -2081,7 +2081,7 @@ set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
"Path to artwork files.") "Path to artwork files.")
if (LINUX) if (LINUX)
set(product SecondLife-${ARCH}-${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}) set(product Alchemy-${ARCH}-${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION})
# These are the generated targets that are copied to package/ # These are the generated targets that are copied to package/
set(COPY_INPUT_DEPENDENCIES set(COPY_INPUT_DEPENDENCIES
...@@ -2159,12 +2159,12 @@ if (DARWIN) ...@@ -2159,12 +2159,12 @@ if (DARWIN)
set(MACOSX_EXECUTABLE_NAME "${VIEWER_CHANNEL}") set(MACOSX_EXECUTABLE_NAME "${VIEWER_CHANNEL}")
set(MACOSX_BUNDLE_INFO_STRING "${VIEWER_CHANNEL}") set(MACOSX_BUNDLE_INFO_STRING "${VIEWER_CHANNEL}")
set(MACOSX_BUNDLE_ICON_FILE "alchemy.icns") set(MACOSX_BUNDLE_ICON_FILE "alchemy.icns")
set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.secondlife.indra.viewer") set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.alchemyviewer.viewer")
set(MACOSX_BUNDLE_LONG_VERSION_STRING "${VIEWER_CHANNEL} ${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}") set(MACOSX_BUNDLE_LONG_VERSION_STRING "${VIEWER_CHANNEL} ${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}")
set(MACOSX_BUNDLE_BUNDLE_NAME "SecondLife") set(MACOSX_BUNDLE_BUNDLE_NAME "Alchemy")
set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}") set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}")
set(MACOSX_BUNDLE_BUNDLE_VERSION "${VIEWER_SHORT_VERSION}${VIEWER_MACOSX_PHASE}${VIEWER_REVISION}") set(MACOSX_BUNDLE_BUNDLE_VERSION "${VIEWER_SHORT_VERSION}${VIEWER_MACOSX_PHASE}${VIEWER_REVISION}")
set(MACOSX_BUNDLE_COPYRIGHT "Copyright © Linden Research, Inc. 2019") set(MACOSX_BUNDLE_COPYRIGHT "Copyright (C) 2013-2020 Alchemy Development Group")
set(MACOSX_BUNDLE_NSMAIN_NIB_FILE "SecondLife.nib") set(MACOSX_BUNDLE_NSMAIN_NIB_FILE "SecondLife.nib")
set(MACOSX_BUNDLE_NSPRINCIPAL_CLASS "LLApplication") set(MACOSX_BUNDLE_NSPRINCIPAL_CLASS "LLApplication")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment