Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 19:10:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

drop in add remove icon during core install

Browse source
This commit is contained in:
Stephen Birarda 2016-01-14 14:51:28 -08:00
parent d57bd887b1
commit 95acd2cfc3
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmake/macros/GenerateInstallers.cmake
View file

@ -29,10 +29,7 @@ macro(GENERATE_INSTALLERS)
# install the uninstaller icon and reference it for Add/Remove icon # install the uninstaller icon and reference it for Add/Remove icon
set(ADD_REMOVE_ICON_NAME "add-remove.ico") set(ADD_REMOVE_ICON_NAME "add-remove.ico")
install( set(ADD_REMOVE_ICON_PATH "${HF_CMAKE_DIR}/installer/${ADD_REMOVE_ICON_NAME}")
FILES "${HF_CMAKE_DIR}/installer/${ADD_REMOVE_ICON_NAME}"
DESTINATION "."
)
set(CPACK_NSIS_INSTALLED_ICON_NAME ${ADD_REMOVE_ICON_NAME}) set(CPACK_NSIS_INSTALLED_ICON_NAME ${ADD_REMOVE_ICON_NAME})
# use macro to put backslashes in header image path since nsis requires them # use macro to put backslashes in header image path since nsis requires them

1
cmake/templates/CPackProperties.cmake.in
View file

@ -28,3 +28,4 @@ set(CONSOLE_STARTUP_REG_KEY "@CONSOLE_STARTUP_REG_KEY@")
set(LAUNCH_NOW_REG_KEY "@LAUNCH_NOW_REG_KEY@") set(LAUNCH_NOW_REG_KEY "@LAUNCH_NOW_REG_KEY@")
set(INSTALLER_HEADER_IMAGE "@INSTALLER_HEADER_IMAGE@") set(INSTALLER_HEADER_IMAGE "@INSTALLER_HEADER_IMAGE@")
set(UNINSTALLER_HEADER_IMAGE "@UNINSTALLER_HEADER_IMAGE@") set(UNINSTALLER_HEADER_IMAGE "@UNINSTALLER_HEADER_IMAGE@")
set(ADD_REMOVE_ICON_PATH "@ADD_REMOVE_ICON_PATH@")

3
cmake/templates/NSIS.template.in
View file

@ -721,6 +721,9 @@ Section "-Core installation"
Call ConditionalAddToRegisty Call ConditionalAddToRegisty
!endif !endif
; Package the add/remove icon file
File "@ADD_REMOVE_ICON_PATH@"
; Optional registration ; Optional registration
Push "DisplayIcon" Push "DisplayIcon"
Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@" Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@"