diff --git a/cmake/macros/ConsolidateStackComponents.cmake b/cmake/macros/ConsolidateStackComponents.cmake index ca272f6485..33b50472bf 100644 --- a/cmake/macros/ConsolidateStackComponents.cmake +++ b/cmake/macros/ConsolidateStackComponents.cmake @@ -11,10 +11,10 @@ macro(CONSOLIDATE_STACK_COMPONENTS) # Copy icon files for interface and stack manager if (TARGET_NAME STREQUAL "interface" OR TARGET_NAME STREQUAL "stack-manager") if (TARGET_NAME STREQUAL "interface") - set (ICON_FILE_PATH "${PROJECT_SOURCE_DIR}/icon/interface.ico") + set (ICON_FILE_PATH "${PROJECT_SOURCE_DIR}/icon/${INTERFACE_ICON}") set (ICON_DESTINATION_NAME "interface.ico") elseif (TARGET_NAME STREQUAL "stack-manager") - set (ICON_FILE_PATH "${PROJECT_SOURCE_DIR}/assets/icon.ico") + set (ICON_FILE_PATH "${PROJECT_SOURCE_DIR}/assets/${STACK_MANAGER_ICON}") set (ICON_DESTINATION_NAME "stack-manager.ico") endif () add_custom_command( diff --git a/cmake/macros/IncludeApplicationVersion.cmake b/cmake/macros/IncludeApplicationVersion.cmake index 753a12a01c..a91f30f6cf 100644 --- a/cmake/macros/IncludeApplicationVersion.cmake +++ b/cmake/macros/IncludeApplicationVersion.cmake @@ -19,17 +19,23 @@ macro(INCLUDE_APPLICATION_VERSION) set(INSTALLER_COMPANY "High Fidelity") set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}") set(INSTALLER_NAME "interface-win64-${BUILD_SEQ}.exe") + set(INTERFACE_ICON "interface.ico") + set(STACK_MANAGER_ICON "icon.ico") elseif (DEFINED ENV{ghprbPullId}) set(DEPLOY_PACKAGE 1) set(BUILD_SEQ "PR-$ENV{ghprbPullId}") set(INSTALLER_COMPANY "High Fidelity - PR") set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}\\${BUILD_SEQ}") set(INSTALLER_NAME "pr-interface-win64-${BUILD_SEQ}.exe") + set(INTERFACE_ICON "interface-beta.ico") + set(STACK_MANAGER_ICON "icon-beta.ico") else () set(BUILD_SEQ "dev") set(INSTALLER_COMPANY "High Fidelity - Dev") set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}") set(INSTALLER_NAME "dev-interface-win64.exe") + set(INTERFACE_ICON "interface-beta.ico") + set(STACK_MANAGER_ICON "icon-beta.ico") endif () configure_file("${MACRO_DIR}/ApplicationVersion.h.in" "${PROJECT_BINARY_DIR}/includes/ApplicationVersion.h") include_directories("${PROJECT_BINARY_DIR}/includes") diff --git a/stack-manager/assets/icon-beta.ico b/stack-manager/assets/icon-beta.ico new file mode 100644 index 0000000000..720fd09a2c Binary files /dev/null and b/stack-manager/assets/icon-beta.ico differ diff --git a/stack-manager/assets/icon-beta.png b/stack-manager/assets/icon-beta.png new file mode 100644 index 0000000000..50f4abf4e7 Binary files /dev/null and b/stack-manager/assets/icon-beta.png differ