Installation on Arch Linux works now

This commit is contained in:
Martin Brodbeck 2018-08-07 17:33:17 +02:00
parent d57f62b07e
commit ed779720d2
3 changed files with 6 additions and 17 deletions

View file

@ -46,8 +46,6 @@ set(CPACK_SOURCE_IGNORE_FILES "/.git/;/.vscode")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "KIMA2") set(CPACK_PACKAGE_INSTALL_DIRECTORY "KIMA2")
set(kima2_SHARE kima2.desktop)
if (WIN32 AND NOT UNIX) if (WIN32 AND NOT UNIX)
set(CPACK_GENERATOR "NSIS;ZIP") set(CPACK_GENERATOR "NSIS;ZIP")
#set(CPACK_CREATE_DESKTOP_LINKS "bin/kima2") #set(CPACK_CREATE_DESKTOP_LINKS "bin/kima2")
@ -60,9 +58,11 @@ else(WIN32 AND NOT UNIX)
set(CPACK_GENERATOR "RPM;DEB") set(CPACK_GENERATOR "RPM;DEB")
set(CPACK_STRIP_FILES "bin/kima2") set(CPACK_STRIP_FILES "bin/kima2")
set(CPACK_SOURCE_STRIP_FILES "") 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" install(FILES "${CMAKE_SOURCE_DIR}/manual/Benutzerhandbuch.pdf"
DESTINATION share) DESTINATION share)
install(FILES "${CMAKE_SOURCE_DIR}/misc/kima2.svg"
DESTINATION share/icons/hicolor/scalable/apps)
endif (WIN32 AND NOT UNIX) endif (WIN32 AND NOT UNIX)
if( MINGW ) if( MINGW )
@ -107,4 +107,4 @@ if( MINGW )
endif( MINGW ) endif( MINGW )
include(InstallRequiredSystemLibraries) include(InstallRequiredSystemLibraries)
include(CPack) include(CPack)

View file

@ -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

View file

@ -1,9 +1,9 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Name=KIMA2 Name=KIMA2
GenericName=POS Program GenericName=Cash Point Program
GenericName[de]=Kassenprogramm GenericName[de]=Kassenprogramm
Comment=A small POS program Comment=A small cash point program
Comment[de]=Ein kleines Kassenprogramm Comment[de]=Ein kleines Kassenprogramm
Exec=kima2 Exec=kima2
Icon=kima2 Icon=kima2