Do not expose CONTENT_* stuff in content_mapnode.h and use a name converter wrapper...

[oweals/minetest.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0bc4796cafd2e53663754738a595927eee30274..e07ca8cef17767455455e7d4239b09190bb83749 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,11 +7,14 @@ endif(${CMAKE_VERSION} STREQUAL "2.8.2")
 # This can be read from ${PROJECT_NAME} after project() is called
 project(minetest)
 
+# Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 2)
-set(VERSION_PATCH 20110731_0)
+set(VERSION_MINOR 4)
+set(VERSION_PATCH dev-20111113)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
+MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***")
+
 # Configuration options
 
 if(WIN32)
@@ -63,7 +66,7 @@ elseif(UNIX) # Linux, BSD etc
        set(EXAMPLE_CONF_DIR "share/doc/${PROJECT_NAME}")
 endif()
 
-install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
+install(FILES "README.txt" DESTINATION "${DOCDIR}")
 install(FILES "doc/changelog.txt" DESTINATION "${DOCDIR}")
 install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")