From c0abb347ac1b4a7a81a1f43f15b6ed4189615702 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sat, 11 Oct 2014 13:37:52 +0200 Subject: [PATCH 1/2] Servatrice: Install icons and desktop file under linux --- servatrice/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt index 4d719f6b7..83fc7900a 100644 --- a/servatrice/CMakeLists.txt +++ b/servatrice/CMakeLists.txt @@ -77,6 +77,10 @@ endif() SET(QT_DONT_USE_QTGUI TRUE) +# Declare path variables +set(ICONDIR share/icons CACHE STRING "icon dir") +set(DESKTOPDIR share/applications CACHE STRING "desktop file destination") + # Include directories INCLUDE_DIRECTORIES(../common) INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR}) @@ -112,6 +116,10 @@ if(UNIX) INSTALL(TARGETS servatrice RUNTIME DESTINATION bin/) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/servatrice.ini.example DESTINATION share/servatice/) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/servatrice.sql DESTINATION share/servatice/) + + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/servatrice.png DESTINATION ${ICONDIR}/hicolor/48x48/apps) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/servatrice.svg DESTINATION ${ICONDIR}/hicolor/scalable/apps) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/servatrice.desktop DESTINATION ${DESKTOPDIR}) endif() elseif(WIN32) INSTALL(TARGETS servatrice RUNTIME DESTINATION ./) From 754b97f2123d59c460458c6fb9867c74c5ab6a67 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sat, 11 Oct 2014 13:38:07 +0200 Subject: [PATCH 2/2] Servatrice: open in a terminal window when started from the menu --- servatrice/servatrice.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/servatrice/servatrice.desktop b/servatrice/servatrice.desktop index 635afe6b0..7149284bc 100644 --- a/servatrice/servatrice.desktop +++ b/servatrice/servatrice.desktop @@ -6,3 +6,5 @@ Name=Servatrice Exec=servatrice Icon=servatrice Categories=Game;CardGame; +Terminal=true +Comment=Game server for Cockatrice