projects / oweals / minetest.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix visual_scale for NDT_PLANTLIKE being set too small
[oweals/minetest.git] / CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba273a0dc656a17a61f66bf7a44891b78a2e423e..8245e703768d98164bc4d777bd67acc4b976f56a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,9 +12,14 @@ set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
 # Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 4)
-set(VERSION_PATCH 6)
+set(VERSION_PATCH 10)
+set(VERSION_PATCH_ORIG ${VERSION_PATCH})
+
 if(VERSION_EXTRA)
        set(VERSION_PATCH ${VERSION_PATCH}-${VERSION_EXTRA})
+else()
+       # Comment the following line during release
+       set(VERSION_PATCH ${VERSION_PATCH}-dev)
 endif()
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
@@ -28,6 +33,13 @@ else()
        set(RUN_IN_PLACE 0 CACHE BOOL "Run directly in source directory structure")
 endif()
 
+# RUN_IN_PLACE is exported as a #define value, ensure it's 1/0 instead of ON/OFF
+if(RUN_IN_PLACE)
+       set(RUN_IN_PLACE 1)
+else()
+       set(RUN_IN_PLACE 0)
+endif()
+
 set(BUILD_CLIENT 1 CACHE BOOL "Build client")
 if(WIN32)
        set(BUILD_SERVER 0 CACHE BOOL "Build server")
@@ -60,11 +72,9 @@ if(WIN32)
        set(EXAMPLE_CONF_DIR ".")
        set(LOCALEDIR "locale")
 elseif(APPLE)
-       # Random placeholders; this isn't usually used and may not work
-       # See https://github.com/toabi/minetest-mac/
-       set(SHAREDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}")
-       set(BINDIR "bin")
-       set(DOCDIR "share/doc/${PROJECT_NAME}")
+       set(SHAREDIR ".")
+       set(BINDIR ".")
+       set(DOCDIR "./doc/${PROJECT_NAME}")
        set(EXAMPLE_CONF_DIR ${DOCDIR})
        set(LOCALEDIR "locale")
 elseif(UNIX) # Linux, BSD etc
@@ -75,6 +85,7 @@ elseif(UNIX) # Linux, BSD etc
                set(EXAMPLE_CONF_DIR ".")
                set(MANDIR "unix/man")
                set(XDG_APPS_DIR "unix/applications")
+               set(APPDATADIR "unix/appdata")
                set(ICONDIR "unix/icons")
                set(LOCALEDIR "locale")
        else()
@@ -84,6 +95,7 @@ elseif(UNIX) # Linux, BSD etc
                set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man")
                set(EXAMPLE_CONF_DIR ${DOCDIR})
                set(XDG_APPS_DIR "${CMAKE_INSTALL_PREFIX}/share/applications")
+               set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/appdata")
                set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
                set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/locale")
        endif()
@@ -124,7 +136,7 @@ if(NOT CUSTOM_ICONDIR STREQUAL "")
        set(ICONDIR "${CUSTOM_ICONDIR}")
        message(STATUS "Using ICONDIR=${ICONDIR}")
 endif()
-set(CUSTOM_LOCALEDIR "" CACHE STRING "Directory to install l10n files into")           
+set(CUSTOM_LOCALEDIR "" CACHE STRING "Directory to install l10n files into")
 if(NOT CUSTOM_LOCALEDIR STREQUAL "")
        set(LOCALEDIR "${CUSTOM_LOCALEDIR}")
        message(STATUS "Using LOCALEDIR=${LOCALEDIR}")
@@ -133,11 +145,6 @@ endif()
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}")
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/client" DESTINATION "${SHAREDIR}")
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/minimal" DESTINATION "${SHAREDIR}/games")
-set(COMMON_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/common")
-if(EXISTS ${COMMON_SOURCE} AND IS_DIRECTORY ${COMMON_SOURCE})
-       install(FILES ${COMMON_SOURCE}/README.txt DESTINATION "${SHAREDIR}/games/common/")
-       install(DIRECTORY ${COMMON_SOURCE}/mods DESTINATION "${SHAREDIR}/games/common")
-endif()
 set(MINETEST_GAME_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/minetest_game")
 if(EXISTS ${MINETEST_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_GAME_SOURCE})
        install(FILES ${MINETEST_GAME_SOURCE}/game.conf DESTINATION "${SHAREDIR}/games/minetest_game/")
@@ -145,37 +152,27 @@ if(EXISTS ${MINETEST_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_GAME_SOURCE})
        install(DIRECTORY ${MINETEST_GAME_SOURCE}/mods DESTINATION "${SHAREDIR}/games/minetest_game")
        install(DIRECTORY ${MINETEST_GAME_SOURCE}/menu DESTINATION "${SHAREDIR}/games/minetest_game")
 endif()
-set(MINETEST_BUILD_GAME_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/build")
-if(EXISTS ${MINETEST_BUILD_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_BUILD_GAME_SOURCE})
-       install(FILES ${MINETEST_BUILD_GAME_SOURCE}/game.conf DESTINATION "${SHAREDIR}/games/build/")
-       install(FILES ${MINETEST_BUILD_GAME_SOURCE}/README.txt DESTINATION "${SHAREDIR}/games/build/")
-       install(DIRECTORY ${MINETEST_BUILD_GAME_SOURCE}/mods DESTINATION "${SHAREDIR}/games/build")
-endif()
-set(MINETEST_SURVIVAL_GAME_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/survival")
-if(EXISTS ${MINETEST_SURVIVAL_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_SURVIVAL_GAME_SOURCE})
-       install(FILES ${MINETEST_SURVIVAL_GAME_SOURCE}/game.conf DESTINATION "${SHAREDIR}/games/survival/")
-       install(FILES ${MINETEST_SURVIVAL_GAME_SOURCE}/README.txt DESTINATION "${SHAREDIR}/games/survival/")
-       install(DIRECTORY ${MINETEST_SURVIVAL_GAME_SOURCE}/mods DESTINATION "${SHAREDIR}/games/survival")
-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")
-       install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/textures/all/textures_here.txt" DESTINATION "${SHAREDIR}/textures/all")
+       install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/mods/mods_here.txt" DESTINATION "${SHAREDIR}/mods")
+       install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/textures/texture_packs_here.txt" DESTINATION "${SHAREDIR}/textures")
 endif()
 
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/fonts" DESTINATION "${SHAREDIR}")
 
 install(FILES "README.txt" DESTINATION "${DOCDIR}")
 install(FILES "doc/lua_api.txt" DESTINATION "${DOCDIR}")
+install(FILES "doc/menu_lua_api.txt" DESTINATION "${DOCDIR}")
 install(FILES "doc/mapformat.txt" DESTINATION "${DOCDIR}")
 install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
 
-if(UNIX)
+if(UNIX AND NOT APPLE)
        install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")
        install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
+       install(FILES "misc/minetest.appdata.xml" DESTINATION "${APPDATADIR}")
        install(FILES "misc/minetest-icon.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
 endif()
 
@@ -205,22 +202,22 @@ if(WIN32)
        #       install(FILES bin/minetestserver.exe DESTINATION bin)
        #endif()
 
-       set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32")
+       if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+               set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win64")
+       else(CMAKE_SIZEOF_VOID_P EQUAL 8)
+               set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32")
+       endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
 
        set(CPACK_GENERATOR ZIP)
 
        # This might be needed for some installer
        #set(CPACK_PACKAGE_EXECUTABLES bin/minetest.exe "Minetest" bin/minetestserver.exe "Minetest Server")
 elseif(APPLE)
-       # TODO
-       # see http://cmake.org/Wiki/CMake:CPackPackageGenerators#Bundle_.28OSX_only.29
-       #
        set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-osx")
-       set(CPACK_PACKAGE_ICON "")
+       set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest-icon.icns)
        set(CPACK_BUNDLE_NAME ${PROJECT_NAME})
-       set(CPACK_BUNDLE_ICON "")
-       set(CPACK_BUNDLE_PLIST "")
-       set(CPACK_BUNDLE_STARTUP_COMMAND "Contents/MacOS/${PROJECT_NAME}")
+       set(CPACK_BUNDLE_ICON ${CPACK_PACKAGE_ICON})
+       set(CPACK_BUNDLE_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/misc/Info.plist)
        set(CPACK_GENERATOR "Bundle")
 else()
        set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-linux")
@@ -230,3 +227,14 @@ endif()
 
 include(CPack)
 
+# Add a target to generate API documentation with Doxygen
+find_package(Doxygen)
+if(DOXYGEN_FOUND)
+       configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/doc/Doxyfile @ONLY)
+       add_custom_target(doc
+               ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doc/Doxyfile
+               WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc
+               COMMENT "Generating API documentation with Doxygen" VERBATIM
+       )
+endif(DOXYGEN_FOUND)
+
Unnamed repository; edit this file 'description' to name the repository.