From e1e56d272341722fe3a7379c17b5dffc1a37951a Mon Sep 17 00:00:00 2001 From: John Parent Date: Tue, 29 Oct 2024 20:53:06 -0400 Subject: [PATCH] Finalize Windows installer behavior + add icons Signed-off-by: John Parent --- gpt4all-chat/cmake/Gpt4allCPack.cmake | 13 +++++++++---- gpt4all-chat/icons/gpt4all-48.bmp | Bin 0 -> 9354 bytes gpt4all-chat/icons/gpt4all-48.ico | Bin 0 -> 9662 bytes 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 gpt4all-chat/icons/gpt4all-48.bmp create mode 100644 gpt4all-chat/icons/gpt4all-48.ico diff --git a/gpt4all-chat/cmake/Gpt4allCPack.cmake b/gpt4all-chat/cmake/Gpt4allCPack.cmake index f13f01ce..6a305b83 100644 --- a/gpt4all-chat/cmake/Gpt4allCPack.cmake +++ b/gpt4all-chat/cmake/Gpt4allCPack.cmake @@ -15,7 +15,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) set(CPACK_PACKAGE_HOMEPAGE_URL "https://www.nomic.ai/gpt4all") -set(CPACK_PACKAGE_EXECUTABLES "gpt4all") +set(CPACK_PACKAGE_EXECUTABLES chat;gpt4all) set(CPACK_CREATE_DESKTOP_LINKS "gpt4all") # TODO: Is there another intro message we want? set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/../README.md") @@ -59,11 +59,16 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES Windows) "${CMAKE_BINARY_DIR}/cmake/deploy-qt-windows.cmake" @ONLY) set(CPACK_PRE_BUILD_SCRIPTS ${CMAKE_BINARY_DIR}/cmake/deploy-qt-windows.cmake) set(CPACK_PACKAGE_FILE_NAME "${COMPONENT_NAME_MAIN}-installer-win64") - set(CPACK_GENERATOR "InnoSetup") - set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/resources/gpt4all.ico") + set(CPACK_GENERATOR "INNOSETUP") + set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/icons/gpt4all-48.bmp") # Todo - extend this to all languages we want to support set(GPT4ALL_DIST_LANGUAGES english) - set(GPT4ALL_ICON_FILE "${CMAKE_CURRENT_SOURCE_DIR}/icons/gpt4all-48.png") + set(GPT4ALL_ICON_FILE "${CMAKE_CURRENT_SOURCE_DIR}/icons/gpt4all-48.ico") + if (CMAKE_SIZEOF_VOID_P GREATER 4) + set(GPT4ALL_INSTALLER_ARCH x64) + else() + set(GPT4ALL_INSTALLER_ARCH x86) + endif() elseif(${CMAKE_SYSTEM_NAME} MATCHES Darwin) find_program(MACDEPLOYQT macdeployqt HINTS ${_qt_bin_dir}) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/deploy-qt-mac.cmake.in" diff --git a/gpt4all-chat/icons/gpt4all-48.bmp b/gpt4all-chat/icons/gpt4all-48.bmp new file mode 100644 index 0000000000000000000000000000000000000000..34e6041a5c4b6d13898f0c13a07a0c48135a75bd GIT binary patch literal 9354 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 M8MK=-yAIO-1L%K