Better apple tree generation

[oweals/minetest.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1074e6d37602e69a56302df1f08f36b16c4e1d8..ff6db1698c481d975a589b23bf936cceb9285b79 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ project(minetest)
 
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 2)
-set(VERSION_PATCH 20110602_0)
+set(VERSION_PATCH 201109xx_dev)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # Configuration options
@@ -21,7 +21,11 @@ else()
 endif()
 
 set(BUILD_CLIENT 1 CACHE BOOL "Build client")
-set(BUILD_SERVER 1 CACHE BOOL "Build server")
+if(WIN32)
+       set(BUILD_SERVER 0 CACHE BOOL "Build server")
+else()
+       set(BUILD_SERVER 1 CACHE BOOL "Build server")
+endif()
 
 set(WARN_ALL 1 CACHE BOOL "Enable -Wall for Release build")
 
@@ -48,18 +52,19 @@ if(WIN32)
        set(EXAMPLE_CONF_DIR ".")
 elseif(APPLE)
        # random placeholders
-       set(DATADIR "share/minetest")
+       set(DATADIR "share/${PROJECT_NAME}")
        set(BINDIR "bin")
-       set(DOCDIR "share/doc/minetest")
+       set(DOCDIR "share/doc/${PROJECT_NAME}")
        set(EXAMPLE_CONF_DIR ".")
 elseif(UNIX) # Linux, BSD etc
-       set(DATADIR "share/minetest")
+       set(DATADIR "share/${PROJECT_NAME}")
        set(BINDIR "bin")
-       set(DOCDIR "share/doc/minetest")
-       set(EXAMPLE_CONF_DIR "share/doc/minetest")
+       set(DOCDIR "share/doc/${PROJECT_NAME}")
+       set(EXAMPLE_CONF_DIR "share/doc/${PROJECT_NAME}")
 endif()
 
 install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
+install(FILES "doc/changelog.txt" DESTINATION "${DOCDIR}")
 install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
 
 #
@@ -103,8 +108,8 @@ elseif(APPLE)
        set(CPACK_BUNDLE_NAME ${PROJECT_NAME})
        set(CPACK_BUNDLE_ICON "")
        set(CPACK_BUNDLE_PLIST "")
-       set(CPACK_BUNDLE_STARTUP_COMMAND "Contents/MacOS/minetest")
-       set(CPACK_GENERATOR BUNDLE)
+       set(CPACK_BUNDLE_STARTUP_COMMAND "Contents/MacOS/${PROJECT_NAME}")
+       set(CPACK_GENERATOR "Bundle")
 else()
        set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-linux")
        set(CPACK_GENERATOR TGZ)