Remove usage of mapgen::add_random_objects(block)

[minetest.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1eb5c2f1312952d2d8d6883298334b9b49acf882..3d68d352fa16aea2635547c35077ecf5c64b3d1b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ project(minetest)
 # Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 4)
-set(VERSION_PATCH dev-20120311)
+set(VERSION_PATCH dev-20120326)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***")
@@ -49,25 +49,29 @@ find_package(Irrlicht)
 #
 
 if(WIN32)
-       set(SHAREDIR "share")
+       set(SHAREDIR ".")
        set(BINDIR "bin")
        set(DOCDIR "doc")
-       set(EXAMPLE_CONF_DIR "user")
+       set(EXAMPLE_CONF_DIR ".")
+       set(LOCALEDIR "locale")
 elseif(APPLE)
-       # random placeholders
+       # Random placeholders; this isn't usually used and may not work
+       # See https://github.com/toabi/minetest-mac/
        set(SHAREDIR "share/${PROJECT_NAME}")
        set(BINDIR "bin")
        set(DOCDIR "share/doc/${PROJECT_NAME}")
        set(EXAMPLE_CONF_DIR ${DOCDIR})
+       set(LOCALEDIR "locale")
 elseif(UNIX) # Linux, BSD etc
        if(RUN_IN_PLACE)
-               set(SHAREDIR "share")
+               set(SHAREDIR ".")
                set(BINDIR "bin")
                set(DOCDIR "doc")
-               set(MANDIR "share/unix/man")
-               set(EXAMPLE_CONF_DIR ${DOCDIR})
-               set(XDG_APPS_DIR "share/unix/applications")
-               set(ICONDIR "share/unix/icons")
+               set(EXAMPLE_CONF_DIR ".")
+               set(MANDIR "unix/man")
+               set(XDG_APPS_DIR "unix/applications")
+               set(ICONDIR "unix/icons")
+               set(LOCALEDIR "locale")
        else()
                set(SHAREDIR "share/${PROJECT_NAME}")
                set(BINDIR "bin")
@@ -76,16 +80,33 @@ elseif(UNIX) # Linux, BSD etc
                set(EXAMPLE_CONF_DIR ${DOCDIR})
                set(XDG_APPS_DIR "share/applications")
                set(ICONDIR "share/icons")
+               set(LOCALEDIR "share/locale")
        endif()
 endif()
 
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}")
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/minimal" DESTINATION "${SHAREDIR}/games")
+set(MINETEST_GAME_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/minetest_game")
+if(EXISTS ${MINETEST_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_GAME_SOURCE})
+       install(DIRECTORY ${MINETEST_GAME_SOURCE} DESTINATION "${SHAREDIR}/games")
+endif()
+if(BUILD_CLIENT)
+       #install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/sounds/base/pack" DESTINATION "${SHAREDIR}/sounds/base")
+       install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/textures/base/pack" DESTINATION "${SHAREDIR}/textures/base")
+endif()
+if(RUN_IN_PLACE)
+       install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/mods/minetest/mods_here.txt" DESTINATION "${SHAREDIR}/mods/minetest")
+endif()
+
 install(FILES "README.txt" DESTINATION "${DOCDIR}")
+install(FILES "doc/lua_api.txt" DESTINATION "${DOCDIR}")
+install(FILES "doc/mapformat.txt" DESTINATION "${DOCDIR}")
 install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
 
 if(UNIX)
        install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")
        install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
-       install(FILES "minetest-icon.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
+       install(FILES "misc/minetest-icon.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
 endif()
 
 #