added windows icon

[oweals/minetest.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e218990c22678d2ac8248e8e939d643b2ef5f54..dc6f45a59e6d8532a436dd1e198f6647fa250370 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,8 +8,8 @@ endif(${CMAKE_VERSION} STREQUAL "2.8.2")
 project(minetest)
 
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 0)
-set(VERSION_PATCH 1)
+set(VERSION_MINOR 2)
+set(VERSION_PATCH 20110730_rc2)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # Configuration options
@@ -45,15 +45,18 @@ if(WIN32)
        set(DATADIR "data")
        set(BINDIR "bin")
        set(DOCDIR "doc")
+       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")
-elseif(UNIX)
-       set(DATADIR "usr/share/minetest")
-       set(BINDIR "usr/bin")
-       set(DOCDIR "usr/share/doc/minetest")
+       set(DOCDIR "share/doc/${PROJECT_NAME}")
+       set(EXAMPLE_CONF_DIR ".")
+elseif(UNIX) # Linux, BSD etc
+       set(DATADIR "share/${PROJECT_NAME}")
+       set(BINDIR "bin")
+       set(DOCDIR "share/doc/${PROJECT_NAME}")
+       set(EXAMPLE_CONF_DIR "share/doc/${PROJECT_NAME}")
 endif()
 
 install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
@@ -77,12 +80,13 @@ 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")
 
@@ -99,8 +103,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)