From af5aed7ef8b1dd22e6984bd3e9754c8efc54d200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Poizl?= Date: Mon, 21 Nov 2022 18:52:44 +0100 Subject: [PATCH] Install metainfo generally --- CMakeLists.txt | 22 +++++----------------- install.cmake | 1 + space.nouspiro.tenmon_128.png | Bin 0 -> 3205 bytes 3 files changed, 6 insertions(+), 17 deletions(-) create mode 100644 space.nouspiro.tenmon_128.png 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 0000000000000000000000000000000000000000..29c78c1c40eb3223b6ef31808f6c66d98d68f31b GIT binary patch literal 3205 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 E2YhiU;s5{u literal 0 HcmV?d00001