backup/planetblupi
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
Code Issues Projects Releases Activity

Fix deploy of desktop file with non-appimage builds

Browse Source
This commit is contained in:
Mathieu Schroeter 2017-10-21 09:51:54 +02:00
parent a50e648d63
commit 29ad6c30f4
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -16,6 +16,8 @@ set (PB_VERSION_PATCH 0)
set (PB_VERSION_EXTRA "") set (PB_VERSION_EXTRA "")
set (PB_PRODUCT_NAME "Planet Blupi") set (PB_PRODUCT_NAME "Planet Blupi")
set (PB_PACKAGE_NAME "planetblupi") set (PB_PACKAGE_NAME "planetblupi")
set (PB_EXEC "planetblupi")
set (PB_ICON_REF "blupi")
set (PB_DESCRIPTION "Planet Blupi - A delirious spell-binding game") set (PB_DESCRIPTION "Planet Blupi - A delirious spell-binding game")
option (PB_HTTP_VERSION_CHECK "Run a version check over HTTP (with CURL)" OFF) option (PB_HTTP_VERSION_CHECK "Run a version check over HTTP (with CURL)" OFF)
@ -272,7 +274,7 @@ endif ()
if (NOT USE_APPIMAGE) if (NOT USE_APPIMAGE)
install ( install (
FILES ${CMAKE_CURRENT_BINARY_DIR}/${PB_PACKAGE_NAME}.desktop FILES ${CMAKE_CURRENT_BINARY_DIR}/${PB_PACKAGE_NAME}.desktop
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/ DESTINATION share/applications
) )
endif () endif ()
@ -303,7 +305,7 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND "${STATIC_BUILD}")
if (USE_APPIMAGE) if (USE_APPIMAGE)
include (LinuxAppImageBuild) include (LinuxAppImageBuild)
set (CMAKE_PACKAGED_OUTPUT_PREFIX ${CMAKE_INSTALL_PREFIX}) set (CMAKE_PACKAGED_OUTPUT_PREFIX ${CMAKE_INSTALL_PREFIX})
APPIMAGE_PACKAGE (planetblupi ${PB_PACKAGE_NAME} ${PB_PRODUCT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/resources/linux" "${CMAKE_BINARY_DIR}/share" "" "" "blupi") APPIMAGE_PACKAGE (planetblupi ${PB_PACKAGE_NAME} ${PB_PRODUCT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/resources/linux" "${CMAKE_BINARY_DIR}/share" "" "" ${PB_ICON_REF})
elseif (MINGW) elseif (MINGW)
set (INSTALLER_FILE_NAME "${PB_PACKAGE_NAME}-${PB_VERSION_MAJOR}.${PB_VERSION_MINOR}.${PB_VERSION_PATCH}${PB_VERSION_EXTRA}") set (INSTALLER_FILE_NAME "${PB_PACKAGE_NAME}-${PB_VERSION_MAJOR}.${PB_VERSION_MINOR}.${PB_VERSION_PATCH}${PB_VERSION_EXTRA}")
set (CPACK_PACKAGE_FILE_NAME "${INSTALLER_FILE_NAME}") set (CPACK_PACKAGE_FILE_NAME "${INSTALLER_FILE_NAME}")

6
resources/linux/application.desktop.in
View File

@ -3,8 +3,8 @@ Version=1.0
Type=Application Type=Application
Name=@PB_PRODUCT_NAME@ Name=@PB_PRODUCT_NAME@
GenericName=Video Game GenericName=Video Game
Comment=@CPACK_PACKAGE_DESCRIPTION_SUMMARY@ Comment=@PB_DESCRIPTION@
Exec=@APPIMAGE_EXEC@ Exec=@PB_EXEC@
StartupWMClass=@APPIMAGE_EXEC_WM@ StartupWMClass=@PB_EXEC@
Icon=@APPIMAGE_ICON_REF@ Icon=@APPIMAGE_ICON_REF@
Categories=Game;StrategyGame; Categories=Game;StrategyGame;