diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e133bd..2d4d360 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,8 +46,6 @@ set(CPACK_SOURCE_IGNORE_FILES "/.git/;/.vscode") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") set(CPACK_PACKAGE_INSTALL_DIRECTORY "KIMA2") -set(kima2_SHARE kima2.desktop) - if (WIN32 AND NOT UNIX) set(CPACK_GENERATOR "NSIS;ZIP") #set(CPACK_CREATE_DESKTOP_LINKS "bin/kima2") @@ -60,9 +58,11 @@ else(WIN32 AND NOT UNIX) set(CPACK_GENERATOR "RPM;DEB") set(CPACK_STRIP_FILES "bin/kima2") set(CPACK_SOURCE_STRIP_FILES "") - install(FILES ${kima2_SHARE} DESTINATION share/applications) + install(FILES ${CMAKE_SOURCE_DIR}/misc/kima2.desktop DESTINATION share/applications) install(FILES "${CMAKE_SOURCE_DIR}/manual/Benutzerhandbuch.pdf" DESTINATION share) + install(FILES "${CMAKE_SOURCE_DIR}/misc/kima2.svg" + DESTINATION share/icons/hicolor/scalable/apps) endif (WIN32 AND NOT UNIX) if( MINGW ) @@ -107,4 +107,4 @@ if( MINGW ) endif( MINGW ) include(InstallRequiredSystemLibraries) -include(CPack) \ No newline at end of file +include(CPack) diff --git a/kima2.desktop b/kima2.desktop deleted file mode 100644 index c86f70f..0000000 --- a/kima2.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=KIMA2 -GenericName=Bible Reading -GenericName[de]=Kassenprogramm -Comment="A small cash point program for markets about children's things" -Comment[de]=Ein kleines Kassenprogramm für Kindersachenmärkte -Exec=kima2 -Categories=Utility; -Name[de_DE]=kima2.desktop diff --git a/misc/kima2.desktop b/misc/kima2.desktop index 6744041..004ab5f 100644 --- a/misc/kima2.desktop +++ b/misc/kima2.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Type=Application Name=KIMA2 -GenericName=POS Program +GenericName=Cash Point Program GenericName[de]=Kassenprogramm -Comment=A small POS program +Comment=A small cash point program Comment[de]=Ein kleines Kassenprogramm Exec=kima2 Icon=kima2