From dcff26b72c8ebb4abae14a506089e9dcae872219 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Tue, 18 Aug 2020 11:21:38 +0800 Subject: [PATCH] Fix dsview desktop icon file install path Icon files should be installed into $prefix/share/icons/hicolor/scalable/apps. Also use $prefix/share/pixmaps to solve compatibility problems under different DE. https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html Signed-off-by: Huang Rui --- DSView/CMakeLists.txt | 4 +++- DSView/DSView.desktop | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/DSView/CMakeLists.txt b/DSView/CMakeLists.txt index 29f848dd..9d129169 100755 --- a/DSView/CMakeLists.txt +++ b/DSView/CMakeLists.txt @@ -423,12 +423,14 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_ install(TARGETS ${PROJECT_NAME} DESTINATION bin/) install(DIRECTORY res DESTINATION share/${PROJECT_NAME}) install(FILES icons/logo.svg DESTINATION share/${PROJECT_NAME} RENAME logo.svg) +install(FILES icons/logo.svg DESTINATION share/icons/hicolor/scalable/apps RENAME dsview.svg) +install(FILES icons/logo.svg DESTINATION share/pixmaps RENAME dsview.svg) install(FILES ../NEWS25 DESTINATION share/${PROJECT_NAME} RENAME NEWS25) install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31) install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf) install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf) install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/) -install(FILES DSView.desktop DESTINATION /usr/share/applications/) +install(FILES DSView.desktop DESTINATION /usr/share/applications/ RENAME dsview.desktop) #=============================================================================== #= Packaging (handled by CPack) diff --git a/DSView/DSView.desktop b/DSView/DSView.desktop index 063e3a0f..4e74e056 100755 --- a/DSView/DSView.desktop +++ b/DSView/DSView.desktop @@ -5,6 +5,6 @@ Name=DSView Comment=GUI Program for DreamSourceLab USB-based Instruments TryExec=DSView Exec=DSView -Icon=/usr/local/share/DSView/logo.png +Icon=dsview.svg Terminal=false Categories=Development;Electronics;Qt;