tested out and commented out some new stuff for the terrain generator, to be used...

[dragonfireclient.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24cb78f392f52edf28d12eeecd95fdd72b74ac49..d5b8028f614561d9c40ded96405d913c28264f4e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,50 +7,88 @@ endif(${CMAKE_VERSION} STREQUAL "2.8.2")
 # This can be read from ${PROJECT_NAME} after project() is called
 project(minetest)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
-include(${CMAKE_SOURCE_DIR}/cmake/Modules/misc.cmake)
+set(VERSION_MAJOR 0)
+set(VERSION_MINOR 2)
+set(VERSION_PATCH 20110424_1_dev)
+set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
-# Default to Release
-if(NOT CMAKE_BUILD_TYPE)
-       set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type: Debug or Release" FORCE)
-endif()
-
-# Configuration
+# Configuration options
 
-set(RUN_IN_PLACE 0 CACHE BOOL "Run directly in source directory structure")
+if(WIN32)
+       set(RUN_IN_PLACE 1 CACHE BOOL "Run directly in source directory structure")
+else()
+       set(RUN_IN_PLACE 0 CACHE BOOL "Run directly in source directory structure")
+endif()
 
 set(BUILD_CLIENT 1 CACHE BOOL "Build client")
 set(BUILD_SERVER 1 CACHE BOOL "Build server")
 
-# Get date and time
-GETDATETIME(BUILD_DATE)
-MESSAGE(STATUS "BUILD_DATE = ${BUILD_DATE}")
+set(WARN_ALL 1 CACHE BOOL "Enable -Wall for Release build")
+
+if(NOT CMAKE_BUILD_TYPE)
+       # Default to release
+       set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type: Debug or Release" FORCE)
+endif()
+
+# Included stuff
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+include(${CMAKE_SOURCE_DIR}/cmake/Modules/misc.cmake)
 
 # This is done here so that relative search paths are more reasnable
 find_package(Irrlicht)
 
-# This way the CMakeLists.txt file in src/ is processed
-add_subdirectory(src)
+#
+# Installation
+#
+
+if(WIN32)
+       set(DATADIR "data")
+       set(BINDIR "bin")
+       set(DOCDIR "doc")
+       set(EXAMPLE_CONF_DIR ".")
+elseif(APPLE)
+       # random placeholders
+       set(DATADIR "share/minetest")
+       set(BINDIR "bin")
+       set(DOCDIR "share/doc/minetest")
+       set(EXAMPLE_CONF_DIR ".")
+elseif(UNIX) # Linux, BSD etc
+       set(DATADIR "share/minetest")
+       set(BINDIR "bin")
+       set(DOCDIR "share/doc/minetest")
+       set(EXAMPLE_CONF_DIR "share/doc/minetest")
+endif()
+
+install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
+install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
 
-install(FILES "doc/README.txt" DESTINATION "share/minetest/doc")
+#
+# Subdirectories
+# Be sure to add all relevant definitions above this
+#
+
+add_subdirectory(src)
 
 # CPack
 
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "An InfiniMiner/Minecraft inspired game")
-set(CPACK_PACKAGE_VERSION_MAJOR 0)
-set(CPACK_PACKAGE_VERSION_MINOR 0)
-set(CPACK_PACKAGE_VERSION_PATCH 0)
+set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
 set(CPACK_PACKAGE_VENDOR "celeron55")
-set(CPACK_PACKAGE_FILE_NAME "minetest-${BUILD_DATE}")
+set(CPACK_PACKAGE_CONTACT "Perttu Ahola <celeron55@gmail.com>")
 
 if(WIN32)
        # For some reason these aren't copied otherwise
-       if(BUILD_CLIENT)
-               install(FILES bin/minetest.exe DESTINATION bin)
-       endif()
-       if(BUILD_SERVER)
-               install(FILES bin/minetestserver.exe DESTINATION bin)
-       endif()
+       # NOTE: For some reason now it seems to work without these
+       #if(BUILD_CLIENT)
+       #       install(FILES bin/minetest.exe DESTINATION bin)
+       #endif()
+       #if(BUILD_SERVER)
+       #       install(FILES bin/minetestserver.exe DESTINATION bin)
+       #endif()
+
+       set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32")
 
        set(CPACK_GENERATOR ZIP)
 
@@ -59,7 +97,8 @@ if(WIN32)
 elseif(APPLE)
        # TODO
        # see http://cmake.org/Wiki/CMake:CPackPackageGenerators#Bundle_.28OSX_only.29
-       set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME})
+       #
+       set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-osx")
        set(CPACK_PACKAGE_ICON "")
        set(CPACK_BUNDLE_NAME ${PROJECT_NAME})
        set(CPACK_BUNDLE_ICON "")
@@ -67,6 +106,7 @@ elseif(APPLE)
        set(CPACK_BUNDLE_STARTUP_COMMAND "Contents/MacOS/minetest")
        set(CPACK_GENERATOR BUNDLE)
 else()
+       set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-linux")
        set(CPACK_GENERATOR TGZ)
        set(CPACK_SOURCE_GENERATOR TGZ)
 endif()