Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Gurr <timo.gurr@gmail.com>2022-01-17 18:29:05 +0300
committerTimo Gurr <timo.gurr@gmail.com>2022-01-17 18:29:05 +0300
commitd2838e27310b2b2b6505a2fc18900f2552815a76 (patch)
tree9dcec159f67764027a056df78e7e8e6465ea94f3
parentacda34d9288eeec239f378a3682e7ddd5a8f8691 (diff)
BUILD: Use GNUInstallDirs to install resources into share
GNUInstallDirs is already used in cmake/install-paths.cmake. This fixes arch-independent files ending up in $prefix/share instead of /usr/share. This is required on multiarch/cross layouts setting the prefix to e.g. /usr/x86_64-pc-linux-gnu or /usr/i686-pc-linux-gnu.
-rw-r--r--src/CMakeLists.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index db3798cbe..3d5dc7e05 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -180,10 +180,10 @@ if(client)
add_subdirectory(mumble)
if(UNIX AND NOT APPLE)
- install(FILES "${CMAKE_SOURCE_DIR}/scripts/org.mumble_voip.mumble.appdata.xml" DESTINATION "share/metainfo")
- install(FILES "${CMAKE_SOURCE_DIR}/scripts/org.mumble_voip.mumble.desktop" DESTINATION "share/applications")
- install(FILES "${CMAKE_SOURCE_DIR}/icons/mumble.svg" DESTINATION "share/icons/hicolor/scalable/apps")
- install(FILES "${CMAKE_SOURCE_DIR}/icons/mumble_256x256.png" DESTINATION "share/icons/hicolor/256x256/apps" RENAME "mumble.png")
+ install(FILES "${CMAKE_SOURCE_DIR}/scripts/org.mumble_voip.mumble.appdata.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo")
+ install(FILES "${CMAKE_SOURCE_DIR}/scripts/org.mumble_voip.mumble.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
+ install(FILES "${CMAKE_SOURCE_DIR}/icons/mumble.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps")
+ install(FILES "${CMAKE_SOURCE_DIR}/icons/mumble_256x256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "mumble.png")
endif()
endif()