diff --git a/CMakeLists.txt b/CMakeLists.txt index ae9bc62..64bcba3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,28 +92,16 @@ endif() install(TARGETS tenmon BUNDLE DESTINATION .) if(UNIX AND NOT APPLE) + include(GNUInstallDirs) find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu) if(XDG-DESKTOP-MENU_EXECUTABLE) install(SCRIPT install.cmake) - if(DEFINED ENV{FLATPAK_DEST}) - install(FILES space.nouspiro.tenmon.svg DESTINATION "$ENV{FLATPAK_DEST}/share/icons/hicolor/scalable/apps") - else() - install(FILES space.nouspiro.tenmon.svg DESTINATION "/usr/share/icons/hicolor/scalable/apps") - endif() else() - if(DEFINED ENV{FLATPAK_DEST}) - install(FILES space.nouspiro.tenmon.desktop DESTINATION "$ENV{FLATPAK_DEST}/share/applications") - install(FILES space.nouspiro.tenmon.png DESTINATION "$ENV{FLATPAK_DEST}/share/icons/hicolor/64x64/apps") - install(FILES space.nouspiro.tenmon.svg DESTINATION "$ENV{FLATPAK_DEST}/share/icons/hicolor/scalable/apps") - else() - install(FILES space.nouspiro.tenmon.desktop DESTINATION "/usr/share/applications") - install(FILES space.nouspiro.tenmon.png DESTINATION "/usr/share/icons/hicolor/64x64/apps") - install(FILES space.nouspiro.tenmon.svg DESTINATION "/usr/share/icons/hicolor/scalable/apps") - endif() - endif() - if(DEFINED ENV{FLATPAK_DEST}) - install(FILES space.nouspiro.tenmon.metainfo.xml DESTINATION "$ENV{FLATPAK_DEST}/share/metainfo") + install(FILES space.nouspiro.tenmon.desktop DESTINATION "${CMAKE_INSTALL_DATADIR}/applications") + install(FILES space.nouspiro.tenmon.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps") + install(FILES space.nouspiro.tenmon_128.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps" RENAME space.nouspiro.tenmon.png) endif() + install(FILES space.nouspiro.tenmon.metainfo.xml DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo") endif(UNIX AND NOT APPLE) option(RELEASE_BUILD "Release build" OFF) diff --git a/install.cmake b/install.cmake index 36ed2ff..79c9634 100644 --- a/install.cmake +++ b/install.cmake @@ -2,3 +2,4 @@ find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu) find_program(XDG-ICON-RESOURCE_EXECUTABLE xdg-icon-resource) execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install --novendor space.nouspiro.tenmon.desktop WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 64 space.nouspiro.tenmon.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) +execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 128 space.nouspiro.tenmon_128.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) diff --git a/space.nouspiro.tenmon_128.png b/space.nouspiro.tenmon_128.png new file mode 100644 index 0000000..29c78c1 Binary files /dev/null and b/space.nouspiro.tenmon_128.png differ