From afbfb8b5792fb1e8b8bf5777576680f1a4f0cd08 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Thu, 25 Apr 2024 10:49:51 +0200 Subject: CMake: Fixed customization of GNUInstallDirs We need to set the custom values before including GNUInstallDirs, so that GNUInstallDirs will set the CMAKE_INSTALL_FULL_ variables correctly. Fixes breakage in aecbf876cd0a7894396a2e5034af9d93bf028aa0. --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d8e9f865..b39ddc7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,8 +26,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED True) # where to look for cmake modules set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules) -include(GNUInstallDirs) - find_package(Gettext) option(WITH_OPENGL "Enable OpenGL support" ON) @@ -44,9 +42,11 @@ elseif(APPLE) set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}/Resources") set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATADIR}/Translations") else() - set(CMAKE_INSTALL_DATADIR ${CMAKE_INSTALL_DATAROOTDIR}/mana) + set(CMAKE_INSTALL_DATADIR "share/mana") endif() +include(GNUInstallDirs) + add_subdirectory(data) if(ENABLE_MANASERV) -- cgit v1.2.3-70-g09d2