X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=CMakeLists.txt;h=da820dcc190b8283407aaa621ef647cf3336475b;hb=01c2b003e1efb839ad246eb939af7fa8336b9ad5;hp=1ea10268a2fb0269e3649b383713f2f4540ffc63;hpb=d435dedb898c7d268dfea3504a38a2cd9998bdb2;p=minetest.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ea10268a..da820dcc1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,24 +7,32 @@ 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)
-
-# Default to Release
-if(NOT CMAKE_BUILD_TYPE)
-	set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type: Debug or Release" FORCE)
-endif()
+set(VERSION_MAJOR 0)
+set(VERSION_MINOR 0)
+set(VERSION_PATCH 1)
+set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
-# 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)
@@ -37,14 +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(BINDIR "bin")
 	set(DOCDIR "share/doc/minetest")
-elseif(UNIX)
-	set(DATADIR "share/minetest")
-	set(BINDIR "bin")
-	set(DOCDIR "share/doc/minetest")
+	set(EXAMPLE_CONF_DIR ".")
+elseif(UNIX) # Linux, BSD etc
+	set(DATADIR "usr/share/minetest")
+	set(BINDIR "usr/bin")
+	set(DOCDIR "usr/share/doc/minetest")
+	set(EXAMPLE_CONF_DIR "usr/share/doc/minetest")
 endif()
 
 install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
@@ -52,6 +64,7 @@ install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
 
 #
 # Subdirectories
+# Be sure to add all relevant definitions above this
 #
 
 add_subdirectory(src)
@@ -59,20 +72,23 @@ 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)
 
@@ -81,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 "")
@@ -89,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()