From 631cbb30186561bfa5eead46b38ade159940cb65 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 1 Nov 2025 17:21:54 +0100 Subject: [PATCH] Use CMAKE_INSTALL_FULL_*DIR for installation directories (#16629) `CMAKE_INSTALL_*DIR`s can be set to absolute paths and in such cases they should not be appended to the installation prefix. This logic is automatically handled by CMake and exposed via the corresponding FULL path variant. --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0806f461c6..29d81b0948 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,15 +169,15 @@ elseif(UNIX) # Linux, BSD etc set(LOCALEDIR "locale") else() include(GNUInstallDirs) - set(SHAREDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}") - set(BINDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") - set(DOCDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DOCDIR}") - set(MANDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_MANDIR}") + set(SHAREDIR "${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}") + set(BINDIR "${CMAKE_INSTALL_FULL_BINDIR}") + set(DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}") + set(MANDIR "${CMAKE_INSTALL_FULL_MANDIR}") set(EXAMPLE_CONF_DIR ${DOCDIR}) - set(XDG_APPS_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/applications") - set(METAINFODIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/metainfo") - set(ICONDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/icons") - set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALEDIR}") + set(XDG_APPS_DIR "${CMAKE_INSTALL_FULL_DATADIR}/applications") + set(METAINFODIR "${CMAKE_INSTALL_FULL_DATADIR}/metainfo") + set(ICONDIR "${CMAKE_INSTALL_FULL_DATADIR}/icons") + set(LOCALEDIR "${CMAKE_INSTALL_FULL_LOCALEDIR}") endif() endif()