From bf5f783e674a41be719ff03b3eb24d67b7e6a8aa Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 4 Jan 2016 13:58:33 -0800 Subject: [PATCH] copy console icon for installer --- cmake/macros/ConsolidateInstallerComponents.cmake | 4 ++++ cmake/macros/SetPackagingParameters.cmake | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmake/macros/ConsolidateInstallerComponents.cmake b/cmake/macros/ConsolidateInstallerComponents.cmake index 661c2aad3f..af97c1ae2d 100644 --- a/cmake/macros/ConsolidateInstallerComponents.cmake +++ b/cmake/macros/ConsolidateInstallerComponents.cmake @@ -12,9 +12,13 @@ macro(CONSOLIDATE_INSTALLER_COMPONENTS) COMMAND "${CMAKE_COMMAND}" -E copy_directory $ ${CMAKE_BINARY_DIR}/package-bundle ) elseif (TARGET_NAME STREQUAL "package-console") + set (ICON_FILE_PATH "${PROJECT_SOURCE_DIR}/resources/${CONSOLE_ICON}") + set (ICON_DESTINATION_NAME "console.ico") + # add a command to copy the folder produced by electron-packager to package-bundle add_custom_command( TARGET ${TARGET_NAME} POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy ${ICON_FILE_PATH} ${CMAKE_BINARY_DIR}/package-bundle/${ICON_DESTINATION_NAME} COMMAND "${CMAKE_COMMAND}" -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/High\ Fidelity\ Console-* ${CMAKE_BINARY_DIR}/package-bundle ) else () diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake index 17408e0868..ef50e98967 100644 --- a/cmake/macros/SetPackagingParameters.cmake +++ b/cmake/macros/SetPackagingParameters.cmake @@ -20,7 +20,7 @@ macro(SET_PACKAGING_PARAMETERS) set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}") set(INSTALLER_NAME "interface-win64-${BUILD_SEQ}.exe") set(INTERFACE_ICON "interface.ico") - set(STACK_MANAGER_ICON "icon.ico") + set(CONSOLE_ICON "console.ico") elseif (DEFINED ENV{ghprbPullId}) set(DEPLOY_PACKAGE 1) set(BUILD_SEQ "PR-$ENV{ghprbPullId}") @@ -28,14 +28,14 @@ macro(SET_PACKAGING_PARAMETERS) 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") + set(CONSOLE_ICON "console.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") + set(CONSOLE_ICON "console.ico") endif () # create a header file our targets can use to find out the application version