From 027a38cb42737971a21b2e87422e85851990c1e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Poizl?= Date: Mon, 18 Apr 2022 15:46:32 +0200 Subject: [PATCH] Revert install.cmake --- CMakeLists.txt | 4 +--- install.cmake | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 install.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index cdab8fd..ccb3f2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,10 +67,8 @@ endif() install(TARGETS tenmon) if(UNIX) find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu) - find_program(XDG-ICON-RESOURCE_EXECUTABLE xdg-icon-resource) if(XDG-DESKTOP-MENU_EXECUTABLE) - execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install --novendor org.nou.tenmon.desktop WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) - execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 32 icon.png org.nou.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) + install(SCRIPT install.cmake) else() install(FILES org.nou.tenmon.desktop DESTINATION "$ENV{FLATPAK_DEST}/usr/share/applications") install(FILES org.nou.tenmon.png DESTINATION "$ENV{FLATPAK_DEST}/usr/share/icons/hicolor/32x32/apps") diff --git a/install.cmake b/install.cmake new file mode 100644 index 0000000..ad9d4b5 --- /dev/null +++ b/install.cmake @@ -0,0 +1,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 org.nou.tenmon.desktop WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) +execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 32 org.nou.tenmon.png org.nou.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})