Use CMAKE_INSTALL_LIBDIR for library installation path

openstreetmap · May 26, 2024 · 97fab94 · 97fab94
1 parent 5bd9cf7
commit 97fab94
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,8 +21,14 @@ project(merkaartor VERSION ${VCS_VERSION})
 # compatibility.
 # Using configure_file() allows us to store the metadata in a .cpp file, thus
 # only rebuilding that one and linking.
-set(SHARE_DIR ${CMAKE_INSTALL_PREFIX}/share/merkaartor)
-set(LIB_DIR   ${CMAKE_INSTALL_PREFIX}/lib/merkaartor)
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    include(GNUInstallDirs)
+    set(SHARE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/merkaartor)
+    set(LIB_DIR   ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/merkaartor)
+else()
+    set(SHARE_DIR ${CMAKE_INSTALL_PREFIX}/share/merkaartor)
+    set(LIB_DIR   ${CMAKE_INSTALL_PREFIX}/lib/merkaartor)
+endif()
 configure_file("${PROJECT_SOURCE_DIR}/cmake/build-metadata.cpp.in" "${PROJECT_BINARY_DIR}/build-metadata.cpp" @ONLY)
 
 set(CMAKE_CXX_STANDARD 17)

diff --git a/plugins/plugins.cmake b/plugins/plugins.cmake
@@ -1,6 +1,8 @@
 
 if (APPLE)
 set(PLUGINS_INSTALL_POSTFIX "merkaartor.app/Contents/plugins")
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+set(PLUGINS_INSTALL_POSTFIX "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/merkaartor/plugins")
 else()
 set(PLUGINS_INSTALL_POSTFIX "lib/merkaartor/plugins")
 endif()