diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2025-11-14 21:37:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-14 13:37:04 -0700 |
| commit | c2755aee40bb37c8440ec58f260b4bd36bd6e256 (patch) | |
| tree | a22978a5683b5938a6a64bca830ae1d8c7619ca0 /cmake | |
| parent | a9f69d86c866236504f28ace8dabfb4a71b650ec (diff) | |
Fix appImage asset extraction (#563)
* Update vcpkg.json
* fix appimage
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/configure-packaging.cmake | 8 | ||||
| -rw-r--r-- | cmake/packaging.cmake | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/cmake/configure-packaging.cmake b/cmake/configure-packaging.cmake index f3d2c115a..9226db686 100644 --- a/cmake/configure-packaging.cmake +++ b/cmake/configure-packaging.cmake @@ -1,6 +1,6 @@ set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY 0) -set(CPACK_COMPONENTS_ALL "Starship") +set(CPACK_COMPONENTS_ALL "SpaghettiKart") if (CPACK_GENERATOR STREQUAL "External") list(APPEND CPACK_COMPONENTS_ALL "extractor" "appimage") @@ -21,9 +21,9 @@ set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/bin") endif() if (CPACK_GENERATOR MATCHES "Bundle") - set(CPACK_BUNDLE_NAME "Starship") + set(CPACK_BUNDLE_NAME "SpaghettiKart") set(CPACK_BUNDLE_PLIST "macosx/Info.plist") - set(CPACK_BUNDLE_ICON "macosx/Starship.icns") - # set(CPACK_BUNDLE_STARTUP_COMMAND "macosx/Starship-macos.sh") + set(CPACK_BUNDLE_ICON "macosx/SpaghettiKart.icns") + # set(CPACK_BUNDLE_STARTUP_COMMAND "macosx/SpaghettiKart-macos.sh") set(CPACK_BUNDLE_APPLE_CERT_APP "-") endif()
\ No newline at end of file diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake index d699d89e7..924a97489 100644 --- a/cmake/packaging.cmake +++ b/cmake/packaging.cmake @@ -60,7 +60,7 @@ if (NOT LINUXDEPLOY_EXECUTABLE) message(STATUS "Downloading linuxdeploy") set(LINUXDEPLOY_EXECUTABLE ${CPACK_PACKAGE_DIRECTORY}/linuxdeploy/linuxdeploy) file(DOWNLOAD - https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20240109-1/linuxdeploy-x86_64.AppImage + https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20251107-1/linuxdeploy-x86_64.AppImage ${LINUXDEPLOY_EXECUTABLE} INACTIVITY_TIMEOUT 10 LOG ${CPACK_PACKAGE_DIRECTORY}/linuxdeploy/download.log @@ -69,6 +69,8 @@ if (NOT LINUXDEPLOY_EXECUTABLE) endif() execute_process( + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CPACK_PACKAGE_DIRECTORY}/config.yml" "${CPACK_TEMPORARY_DIRECTORY}/usr/bin/config.yml" + COMMAND ${CMAKE_COMMAND} -E copy_directory "${CPACK_PACKAGE_DIRECTORY}/yamls/" "${CPACK_TEMPORARY_DIRECTORY}/usr/bin/yamls/" COMMAND ${CMAKE_COMMAND} -E env OUTPUT=${CPACK_PACKAGE_FILE_NAME}.appimage |