From 2517ed6442992c13b88ec1c2375d5c222f681eae Mon Sep 17 00:00:00 2001
From: Rochet2 <tqbattlenet@gmail.com>
Date: Mon, 17 Aug 2015 20:54:37 +0300
Subject: [PATCH] Fix TC new cmake paths and GitRevision changes

---
 CMakeLists.txt  | 28 +++++++++++++++-------------
 ElunaIncludes.h |  4 ++--
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 586dbda..fb3d0c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,28 +46,31 @@ if( ${CMAKE_PROJECT_NAME} STREQUAL "TrinityCore" )
     ${CMAKE_SOURCE_DIR}/dep/SFMT
     ${CMAKE_SOURCE_DIR}/dep/cppformat
     ${CMAKE_SOURCE_DIR}/dep/mersennetwister
+    ${CMAKE_SOURCE_DIR}/src/common
+    ${CMAKE_SOURCE_DIR}/src/common/Collision
+    ${CMAKE_SOURCE_DIR}/src/common/Collision/Management
+    ${CMAKE_SOURCE_DIR}/src/common/Collision/Maps
+    ${CMAKE_SOURCE_DIR}/src/common/Collision/Models
+    ${CMAKE_SOURCE_DIR}/src/common/Configuration
+    ${CMAKE_SOURCE_DIR}/src/common/Debugging
+    ${CMAKE_SOURCE_DIR}/src/common/Logging
+    ${CMAKE_SOURCE_DIR}/src/common/Threading
+    ${CMAKE_SOURCE_DIR}/src/common/Utilities
+    ${CMAKE_SOURCE_DIR}/src/server/database
+    ${CMAKE_SOURCE_DIR}/src/server/database/Database
+    ${CMAKE_SOURCE_DIR}/src/server/database/Logging
+    ${CMAKE_SOURCE_DIR}/src/server/database/Updater
     ${CMAKE_SOURCE_DIR}/src/server/shared
-    ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
     ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography
     ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography/Authentication
-    ${CMAKE_SOURCE_DIR}/src/server/shared/Database
     ${CMAKE_SOURCE_DIR}/src/server/shared/DataStores
-    ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
     ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic/CountedReference
     ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic/LinkedReference
     ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic
-    ${CMAKE_SOURCE_DIR}/src/server/shared/Logging
     ${CMAKE_SOURCE_DIR}/src/server/shared/Packets
     ${CMAKE_SOURCE_DIR}/src/server/shared/Policies
-    ${CMAKE_SOURCE_DIR}/src/server/shared/Threading
-    ${CMAKE_SOURCE_DIR}/src/server/shared/Utilities
+    ${CMAKE_SOURCE_DIR}/src/server/shared/Service
     ${CMAKE_SOURCE_DIR}/src/server/ipc
-    ${CMAKE_SOURCE_DIR}/src/server/collision
-    ${CMAKE_SOURCE_DIR}/src/server/collision/Management
-    ${CMAKE_SOURCE_DIR}/src/server/collision/Models
-    ${CMAKE_SOURCE_DIR}/src/server/collision/Maps
-    ${CMAKE_SOURCE_DIR}/src/server/shared
-    ${CMAKE_SOURCE_DIR}/src/server/shared/Database
     ${CMAKE_SOURCE_DIR}/src/server/game/Accounts
     ${CMAKE_SOURCE_DIR}/src/server/game/Achievements
     ${CMAKE_SOURCE_DIR}/src/server/game/Addons
@@ -84,7 +87,6 @@ if( ${CMAKE_PROJECT_NAME} STREQUAL "TrinityCore" )
     ${CMAKE_SOURCE_DIR}/src/server/game/Chat
     ${CMAKE_SOURCE_DIR}/src/server/game/Chat/Channels
     ${CMAKE_SOURCE_DIR}/src/server/game/Conditions
-    ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
     ${CMAKE_SOURCE_DIR}/src/server/game/Combat
     ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
     ${CMAKE_SOURCE_DIR}/src/server/game/DungeonFinding
diff --git a/ElunaIncludes.h b/ElunaIncludes.h
index 16ad3d1..6784bbd 100644
--- a/ElunaIncludes.h
+++ b/ElunaIncludes.h
@@ -45,7 +45,7 @@
 #include "SpellInfo.h"
 #include "WeatherMgr.h"
 #include "Battleground.h"
-#include "revision.h"
+#include "GitRevision.h"
 #include "SpellHistory.h"
 #else
 #include "Config/Config.h"
@@ -88,7 +88,7 @@ typedef Opcodes                 OpcodesList;
 
 #ifdef TRINITY
 #define CORE_NAME               "TrinityCore"
-#define CORE_VERSION            _DATE
+#define CORE_VERSION            (GitRevision::GetDate())
 #define eWorld                  (sWorld)
 #define eMapMgr                 (sMapMgr)
 #define eConfigMgr              (sConfigMgr)