Buildsystem: Generating revision.h is now a part of build process (revision.h is back as target)

Buildsystem: Removed non-existing include directories

--HG--
branch : trunk

6 files changed, 24 insertions, 2 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7eb2c78fee2..cf92eb79753 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,6 +8,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+add_subdirectory(revision.h)
 add_subdirectory(server)
 
 if(TOOLS)
diff --git a/src/revision.h/CMakeLists.txt b/src/revision.h/CMakeLists.txt
new file mode 100644
index 00000000000..316ed5b8580
--- /dev/null
+++ b/src/revision.h/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# Need to pass old ${CMAKE_BINARY_DIR} as param because its different at build stage
+add_custom_target(revision.h ALL
+  COMMAND ${CMAKE_COMMAND} -DBUILDDIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/genrev.cmake
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+)
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 6dbc11b2262..0b666d2d91a 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -68,6 +68,8 @@ add_executable(authserver
   ${authserver_SRCS}
 )
 
+add_dependencies(authserver revision.h)
+
 if( NOT WIN32 )
   add_definitions(-D_TRINITY_REALM_CONFIG="${CONF_DIR}/authserver.conf")
 endif()
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 16ba912a18a..fc5a6819808 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -173,7 +173,6 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/Movement/MovementGenerators
   ${CMAKE_CURRENT_SOURCE_DIR}/Movement/Waypoints
   ${CMAKE_CURRENT_SOURCE_DIR}/OutdoorPvP
-  ${CMAKE_CURRENT_SOURCE_DIR}/OutdoorPvP/Zones
   ${CMAKE_CURRENT_SOURCE_DIR}/Pools
   ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
   ${CMAKE_CURRENT_SOURCE_DIR}/Quests
@@ -198,6 +197,8 @@ include_directories(
 
 add_library(game STATIC ${game_STAT_SRCS})
 
+add_dependencies(game revision.h)
+
 # Generate precompiled header
 if( USE_COREPCH )
   if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 3fea1db2fd1..bac2347dde7 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -141,6 +141,8 @@ include_directories(
 
 add_library(scripts STATIC ${scripts_STAT_SRCS})
 
+add_dependencies(scripts revision.h)
+
 # Generate precompiled header
 if( USE_SCRIPTPCH )
   if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 5c713af5057..006338e8114 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -116,7 +116,6 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators
   ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints
   ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP
-  ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP/Zones
   ${CMAKE_SOURCE_DIR}/src/server/game/Pools
   ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders
   ${CMAKE_SOURCE_DIR}/src/server/game/Quests
@@ -149,6 +148,8 @@ if( NOT WIN32 )
   add_definitions(-D_TRINITY_CORE_CONFIG="${CONF_DIR}/worldserver.conf")
 endif()
 
+add_dependencies(worldserver revision.h)
+
 if( UNIX )
   set(worldserver_LINK_FLAGS "-pthread -lncurses ${worldserver_LINK_FLAGS}")
 endif()