mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: [CMake] Fix install paths using GNUInstallDirs

pull/8218/head
Dan Church 2020-06-18 11:34:19 -05:00 committed by Charles Pigott
parent b0f192abc4
commit 506598a80a
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -8,6 +8,13 @@ endif (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
# Use GNUInstallDirs to allow customisation
# but set our own default data dir
if (NOT CMAKE_INSTALL_DATADIR)
set(CMAKE_INSTALL_DATADIR "share/games")
endif (NOT CMAKE_INSTALL_DATADIR)
include(GNUInstallDirs)
include(Options) include(Options)
set_options() set_options()
set_directory_options() set_directory_options()

12
cmake/InstallAndPackage.cmake
View File

@ -1,9 +1,11 @@
include(GNUInstallDirs)
# If requested, use FHS layout; otherwise fall back to a flat layout. # If requested, use FHS layout; otherwise fall back to a flat layout.
if (OPTION_INSTALL_FHS) if (OPTION_INSTALL_FHS)
set(BINARY_DESTINATION_DIR "bin") set(BINARY_DESTINATION_DIR "${CMAKE_INSTALL_BINDIR}")
set(DATA_DESTINATION_DIR "share/games/openttd") set(DATA_DESTINATION_DIR "${CMAKE_INSTALL_DATADIR}/openttd")
set(DOCS_DESTINATION_DIR "share/doc/openttd") set(DOCS_DESTINATION_DIR "${CMAKE_INSTALL_DOCDIR}")
set(MAN_DESTINATION_DIR "share/man/openttd") set(MAN_DESTINATION_DIR "${CMAKE_INSTALL_MANDIR}")
else (OPTION_INSTALL_FHS) else (OPTION_INSTALL_FHS)
set(BINARY_DESTINATION_DIR ".") set(BINARY_DESTINATION_DIR ".")
set(DATA_DESTINATION_DIR ".") set(DATA_DESTINATION_DIR ".")
@ -40,7 +42,7 @@ install(FILES
if (OPTION_INSTALL_FHS) if (OPTION_INSTALL_FHS)
install(FILES install(FILES
${CMAKE_SOURCE_DIR}/docs/openttd.6 ${CMAKE_SOURCE_DIR}/docs/openttd.6
DESTINATION ${MAN_DESTINATION_DIR} DESTINATION ${MAN_DESTINATION_DIR}/man6
COMPONENT manual) COMPONENT manual)
endif (OPTION_INSTALL_FHS) endif (OPTION_INSTALL_FHS)

4
cmake/Options.cmake
View File

@ -1,3 +1,5 @@
include(GNUInstallDirs)
# Set the options for the directories (personal, shared, global). # Set the options for the directories (personal, shared, global).
# #
# set_directory_options() # set_directory_options()
@ -14,7 +16,7 @@ function(set_directory_options)
elseif (UNIX) elseif (UNIX)
set(DEFAULT_PERSONAL_DIR ".openttd") set(DEFAULT_PERSONAL_DIR ".openttd")
set(DEFAULT_SHARED_DIR "(not set)") set(DEFAULT_SHARED_DIR "(not set)")
set(DEFAULT_GLOBAL_DIR "${CMAKE_INSTALL_PREFIX}/share/games/openttd") set(DEFAULT_GLOBAL_DIR "${CMAKE_INSTALL_FULL_DATADIR}/openttd")
else () else ()
message(FATAL_ERROR "Unknown OS found; please consider creating a Pull Request to add support for this OS.") message(FATAL_ERROR "Unknown OS found; please consider creating a Pull Request to add support for this OS.")
endif () endif ()