3 files changed, 24 insertions, 0 deletions

diff --git a/src/BuildInfo.h.cmake b/src/BuildInfo.h.cmake
new file mode 100644
index 000000000..6337dab3e
--- /dev/null
+++ b/src/BuildInfo.h.cmake
@@ -0,0 +1,15 @@
+
+#pragma once
+
+#cmakedefine BUILD_ID
+
+#ifdef BUILD_ID
+
+#undef BUILD_ID
+
+#define BUILD_SERIES_NAME "@BUILD_SERIES_NAME@"
+#define BUILD_ID          "@BUILD_ID@"
+#define BUILD_COMMIT_ID   "@BUILD_COMMIT_ID@"
+#define BUILD_DATETIME    "@BUILD_DATETIME@"
+#endif
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2d96662a9..9d0e2cede 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -75,6 +75,7 @@ SET (HDRS
 	BlockInfo.h
 	BlockTracer.h
 	BoundingBox.h
+	BuildInfo.h.cmake
 	ByteBuffer.h
 	ChatColor.h
 	Chunk.h
@@ -140,6 +141,8 @@ include_directories(".")
 include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/sqlite")
 include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/SQLiteCpp/include")
 
+configure_file("BuildInfo.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/BuildInfo.h")
+
 if (NOT MSVC)
 	# Bindings need to reference other folders, so they are done here instead
 	# lib dependencies are not included
diff --git a/src/Root.cpp b/src/Root.cpp
index 870662f36..86a497a76 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -18,6 +18,7 @@
 #include "DeadlockDetect.h"
 #include "OSSupport/Timer.h"
 #include "LoggerListeners.h"
+#include "BuildInfo.h"
 
 #include "inifile/iniFile.h"
 
@@ -111,6 +112,11 @@ void cRoot::Start(void)
 	
 	LOG("--- Started Log ---\n");
 
+	#ifdef BUILD_ID
+	LOG("MCServer " BUILD_SERIES_NAME " build id: " BUILD_ID );
+	LOG("from commit id: " BUILD_COMMIT_ID " built at: " BUILD_DATETIME );
+	#endif
+
 	cDeadlockDetect dd;
 
 	m_bStop = false;