Skip to content

Commit 52f0660

Browse files
authored
Merge pull request OpenXcom#1137 from woutershep/GNUInstallDirs
Use the GNUInstallDirs for the .desktop and icons.
2 parents 092971e + ad8aabe commit 52f0660

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,14 @@ if ( BUILD_PACKAGE )
165165
endif()
166166

167167
if ( NOT WIN32 )
168-
install(FILES "${CMAKE_SOURCE_DIR}/res/linux/openxcom.desktop" DESTINATION share/applications)
169-
install(FILES "${CMAKE_SOURCE_DIR}/res/linux/icons/openxcom_48x48.png" DESTINATION share/icons/hicolor/48x48/apps RENAME openxcom.png)
170-
install(FILES "${CMAKE_SOURCE_DIR}/res/linux/icons/openxcom_128x128.png" DESTINATION share/icons/hicolor/128x128/apps RENAME openxcom.png)
171-
install(FILES "${CMAKE_SOURCE_DIR}/res/linux/icons/openxcom.svg" DESTINATION share/icons/hicolor/scalable/apps)
168+
install(FILES "${CMAKE_SOURCE_DIR}/res/linux/openxcom.desktop"
169+
DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
170+
install(FILES "${CMAKE_SOURCE_DIR}/res/linux/icons/openxcom_48x48.png"
171+
DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/48x48/apps" RENAME openxcom.png)
172+
install(FILES "${CMAKE_SOURCE_DIR}/res/linux/icons/openxcom_128x128.png"
173+
DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/128x128/apps" RENAME openxcom.png)
174+
install(FILES "${CMAKE_SOURCE_DIR}/res/linux/icons/openxcom.svg"
175+
DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps")
172176
endif ()
173177

174178
add_subdirectory ( docs )

0 commit comments

Comments
 (0)