From 25228b68364d0d4a78827915cd02bd4a11e8bdaf Mon Sep 17 00:00:00 2001 From: beaglejoe Date: Tue, 19 Jul 2022 01:59:04 +0000 Subject: [PATCH] Fix graphics for the Windows all-in-one installer git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8323 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: ea88836069bef050fb19deaedb824355868f825b Former-commit-id: 2119f32f9e043248399905173c96749d78f8720d --- cmake/packagemaker.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake/packagemaker.cmake b/cmake/packagemaker.cmake index 63316d73..9351b244 100644 --- a/cmake/packagemaker.cmake +++ b/cmake/packagemaker.cmake @@ -99,14 +99,17 @@ IF(WIN32) MARK_AS_ADVANCED(PACKAGERS_SOURCE) SET(CPACK_PACKAGE_FILE_NAME "${PACKAGE_FILE_PREFIX}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}-setup") - SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}${PROJECT_VERSION_METADATA}") + SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}${PROJECT_VERSION_METADATA}") SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}") #SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") # Icon for the generated installer/uninstaller files. SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}\\\\data\\\\data\\\\icons\\\\icon.ico") SET(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}\\\\data\\\\data\\\\icons\\\\icon.ico") - SET(CPACK_PACKAGE_ICON ${CMAKE_SOURCE_DIR}\\\\data\\\\data\\\\img\\\\header.bmp) + SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}\\\\data\\\\data\\\\img\\\\header.bmp") + SET(CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP "${CMAKE_SOURCE_DIR}\\\\data\\\\data\\\\img\\\\header-vert.bmp") + SET(CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP "${CMAKE_SOURCE_DIR}\\\\data\\\\data\\\\img\\\\header-vert.bmp") + SET(CPACK_NSIS_MUI_HEADERIMAGE "${CMAKE_SOURCE_DIR}\\\\data\\\\data\\\\img\\\\header.bmp") # Extra shortcuts to add in the start menu (a list of pairs : URL, Menu label). SET(CPACK_NSIS_MENU_LINKS