Skip to content

Commit

Permalink
Merge pull request #152 from diiigle/patch-1
Browse files Browse the repository at this point in the history
#Fix UNIX install prefixes according to CMake recommendation
  • Loading branch information
Tom94 authored Dec 26, 2021
2 parents 47d5b0d + 63aa3ae commit 8066f34
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -234,17 +234,17 @@ if (APPLE)
elseif (WIN32)
install(TARGETS tev RUNTIME DESTINATION "bin")
else()
install(TARGETS tev RUNTIME DESTINATION "bin")
install(TARGETS tev)

configure_file(resources/tev.desktop resources/tev.desktop)
install(FILES ${CMAKE_BINARY_DIR}/resources/tev.desktop DESTINATION "/usr/share/applications")
install(FILES resources/icon-512.png DESTINATION "/usr/share/icons/hicolor/512x512/apps" RENAME tev.png)
install(FILES resources/icon-256.png DESTINATION "/usr/share/icons/hicolor/256x256/apps" RENAME tev.png)
install(FILES resources/icon-128.png DESTINATION "/usr/share/icons/hicolor/128x128/apps" RENAME tev.png)
install(FILES resources/icon-96.png DESTINATION "/usr/share/icons/hicolor/96x96/apps" RENAME tev.png)
install(FILES resources/icon-64.png DESTINATION "/usr/share/icons/hicolor/64x64/apps" RENAME tev.png)
install(FILES resources/icon-48.png DESTINATION "/usr/share/icons/hicolor/48x48/apps" RENAME tev.png)
install(FILES resources/icon-32.png DESTINATION "/usr/share/icons/hicolor/32x32/apps" RENAME tev.png)
install(FILES resources/icon-24.png DESTINATION "/usr/share/icons/hicolor/24x24/apps" RENAME tev.png)
install(FILES resources/icon-16.png DESTINATION "/usr/share/icons/hicolor/16x16/apps" RENAME tev.png)
install(FILES ${CMAKE_BINARY_DIR}/resources/tev.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
install(FILES resources/icon-512.png DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/512x512/apps" RENAME tev.png)
install(FILES resources/icon-256.png DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME tev.png)
install(FILES resources/icon-128.png DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/128x128/apps" RENAME tev.png)
install(FILES resources/icon-96.png DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/96x96/apps" RENAME tev.png)
install(FILES resources/icon-64.png DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/64x64/apps" RENAME tev.png)
install(FILES resources/icon-48.png DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/48x48/apps" RENAME tev.png)
install(FILES resources/icon-32.png DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME tev.png)
install(FILES resources/icon-24.png DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/24x24/apps" RENAME tev.png)
install(FILES resources/icon-16.png DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME tev.png)
endif()
2 changes: 1 addition & 1 deletion resources/tev.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Version=1.0
Name=tev
GenericName=Image Viewer
Comment=High dynamic range (HDR) image comparison tool.
Exec=${CMAKE_INSTALL_PREFIX}/bin/tev %F
Exec=${CMAKE_INSTALL_FULL_BINDIR}/tev %F
Icon=tev.png
Terminal=false
MimeType=image/*;
Expand Down

0 comments on commit 8066f34

Please sign in to comment.