BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix installation in cmake project files

Browse Source
This commit is contained in:
Perttu Ahola 2012-03-18 16:30:02 +02:00
parent 99d257ae8b
commit b409803527
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
CMakeLists.txt
View File

@ -49,29 +49,38 @@ find_package(Irrlicht)
# #
if(WIN32) if(WIN32)
set(DATADIR "data") set(SHAREDIR "share")
set(BINDIR "bin") set(BINDIR "bin")
set(DOCDIR "doc") set(DOCDIR "doc")
set(EXAMPLE_CONF_DIR ".") set(EXAMPLE_CONF_DIR "user")
elseif(APPLE) elseif(APPLE)
# random placeholders # random placeholders
set(DATADIR "share/${PROJECT_NAME}") set(SHAREDIR "share/${PROJECT_NAME}")
set(BINDIR "bin") set(BINDIR "bin")
set(DOCDIR "share/doc/${PROJECT_NAME}") set(DOCDIR "share/doc/${PROJECT_NAME}")
set(EXAMPLE_CONF_DIR ".") set(EXAMPLE_CONF_DIR ${DOCDIR})
elseif(UNIX) # Linux, BSD etc elseif(UNIX) # Linux, BSD etc
set(DATADIR "share/${PROJECT_NAME}") if(RUN_IN_PLACE)
set(BINDIR "bin") set(SHAREDIR "share")
set(DOCDIR "share/doc/${PROJECT_NAME}") set(BINDIR "bin")
set(MANDIR "share/man") set(DOCDIR "doc")
set(EXAMPLE_CONF_DIR "share/doc/${PROJECT_NAME}") set(MANDIR "share/unix/man")
set(XDG_APPS_DIR "share/applications") set(EXAMPLE_CONF_DIR ${DOCDIR})
set(ICONDIR "share/icons") set(XDG_APPS_DIR "share/unix/applications")
set(ICONDIR "share/unix/icons")
else()
set(SHAREDIR "share/${PROJECT_NAME}")
set(BINDIR "bin")
set(DOCDIR "share/doc/${PROJECT_NAME}")
set(MANDIR "share/man")
set(EXAMPLE_CONF_DIR ${DOCDIR})
set(XDG_APPS_DIR "share/applications")
set(ICONDIR "share/icons")
endif()
endif() endif()
install(FILES "README.txt" DESTINATION "${DOCDIR}") install(FILES "README.txt" DESTINATION "${DOCDIR}")
install(FILES "doc/changelog.txt" DESTINATION "${DOCDIR}") install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
if(UNIX) if(UNIX)
install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6") install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")

10
src/CMakeLists.txt
View File

@ -310,18 +310,10 @@ endif()
# Installation # Installation
# #
# Example configuration file
# NOTE: Install is handled elsewhere
#install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
if(BUILD_CLIENT) if(BUILD_CLIENT)
install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR}) install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
#file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/../data/textures/*.png") install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../share/" DESTINATION ${SHAREDIR})
#install(FILES ${images} DESTINATION ${DATADIR}/textures)
#file(GLOB datasubstuff "${CMAKE_CURRENT_SOURCE_DIR}/../data/*")
#install(DIRECTORY "${datasubstuff}" DESTINATION ${DATADIR})
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../data/" DESTINATION ${DATADIR})
if(USE_GETTEXT) if(USE_GETTEXT)
foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES}) foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})