Branch merge

--HG--
branch : trunk

10 files changed, 77 insertions, 1 deletions

diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt
index 41ca661de98..06726ee6e85 100644
--- a/src/framework/CMakeLists.txt
+++ b/src/framework/CMakeLists.txt
@@ -2,7 +2,9 @@ SET(trinityframework_STAT_SRCS
    Policies/ObjectLifeTime.cpp
    Utilities/EventProcessor.cpp
 )
+
 include_directories(
-${CMAKE_CURRENT_SRC_DIR}
+  ${CMAKE_SOURCE_DIR}/src/framework
 )
+
 add_library(trinityframework STATIC ${trinityframework_STAT_SRCS})
diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
index 8fa5dc1b66d..d5eddf0dd51 100644
--- a/src/game/CMakeLists.txt
+++ b/src/game/CMakeLists.txt
@@ -309,6 +309,16 @@ SET(game_STAT_SRCS
    ZoneScript.h
 )
 
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/dep/include
+  ${CMAKE_SOURCE_DIR}/src/framework
+  ${CMAKE_SOURCE_DIR}/src/shared
+  ${CMAKE_SOURCE_DIR}/src/shared/vmap
+  ${CMAKE_SOURCE_DIR}/src/shared/Database
+  ${MYSQL_INCLUDE_DIR}
+)
+
 if(NOT DO_SCRIPTS)
    SET(game_STAT_SRCS ${game_STAT_SRCS}
       ScriptedEscortAI.cpp
diff --git a/src/scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt
index 69dd177223b..e3e6f06b976 100644
--- a/src/scripts/CMakeLists.txt
+++ b/src/scripts/CMakeLists.txt
@@ -567,5 +567,16 @@ SET(scripts_STAT_SRCS
    world/npc_taxi.cpp
 )
 message("-- Added Script Engine to SCRIPTS lib")
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src/shared
+  ${CMAKE_SOURCE_DIR}/src/framework
+  ${CMAKE_SOURCE_DIR}/src/game
+  ${CMAKE_SOURCE_DIR}/src/shared/Database
+  ${CMAKE_SOURCE_DIR}/dep/include
+  ${MYSQL_INCLUDE_DIR}
+)
+
 add_library(scripts STATIC ${scripts_STAT_SRCS})
 
diff --git a/src/shared/Auth/CMakeLists.txt b/src/shared/Auth/CMakeLists.txt
index 536853e560e..b6f487465ed 100644
--- a/src/shared/Auth/CMakeLists.txt
+++ b/src/shared/Auth/CMakeLists.txt
@@ -16,4 +16,11 @@ SET(trinityauth_STAT_SRCS
    SARC4.h
 )
 
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src/shared
+  ${CMAKE_SOURCE_DIR}/src/framework
+  ${MYSQL_INCLUDE_DIR}
+)
+
 add_library(trinityauth STATIC ${trinityauth_STAT_SRCS})
diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
index 5349a89f613..1d4ee451440 100644
--- a/src/shared/CMakeLists.txt
+++ b/src/shared/CMakeLists.txt
@@ -23,6 +23,16 @@ SET(shared_STAT_SRCS
    WorldPacket.h
    SystemConfig.h
 )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/dep/include
+  ${CMAKE_SOURCE_DIR}/dep/include/sockets
+  ${CMAKE_SOURCE_DIR}/src/framework
+  ${CMAKE_SOURCE_DIR}/src/shared
+  ${MYSQL_INCLUDE_DIR}
+)
+
 add_library(shared STATIC ${shared_STAT_SRCS})
 target_link_libraries(
 shared
diff --git a/src/shared/Config/CMakeLists.txt b/src/shared/Config/CMakeLists.txt
index 54c3d80b869..397005586b6 100644
--- a/src/shared/Config/CMakeLists.txt
+++ b/src/shared/Config/CMakeLists.txt
@@ -11,5 +11,11 @@ SET(trinityconfig_STAT_SRCS
    ConfigEnv.h
 )
 
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src/shared
+  ${CMAKE_SOURCE_DIR}/src/framework
+)
+
 add_library(trinityconfig STATIC ${trinityconfig_STAT_SRCS})
 
diff --git a/src/shared/Database/CMakeLists.txt b/src/shared/Database/CMakeLists.txt
index 158a3993d16..9ae0c73f53a 100644
--- a/src/shared/Database/CMakeLists.txt
+++ b/src/shared/Database/CMakeLists.txt
@@ -27,4 +27,12 @@ SET(trinitydatabase_STAT_SRCS
     SqlOperations.h
 )
 
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src/shared
+  ${CMAKE_SOURCE_DIR}/src/shared/Database
+  ${CMAKE_SOURCE_DIR}/src/framework
+  ${MYSQL_INCLUDE_DIR}
+)
+
 add_library(trinitydatabase STATIC ${trinitydatabase_STAT_SRCS})
diff --git a/src/shared/vmap/CMakeLists.txt b/src/shared/vmap/CMakeLists.txt
index 9ed30c0b44f..76ba24e55d1 100644
--- a/src/shared/vmap/CMakeLists.txt
+++ b/src/shared/vmap/CMakeLists.txt
@@ -31,5 +31,9 @@ SET(vmaps_STAT_SRCS
    VMapTools.h
 )
 
+include_directories(
+  ${CMAKE_SOURCE_DIR}/dep/include/g3dlite
+)
+
 add_library(vmaps STATIC ${vmaps_STAT_SRCS})
 
diff --git a/src/trinitycore/CMakeLists.txt b/src/trinitycore/CMakeLists.txt
index acad3667ea7..bb93fdb97a5 100644
--- a/src/trinitycore/CMakeLists.txt
+++ b/src/trinitycore/CMakeLists.txt
@@ -13,6 +13,16 @@ WorldRunnable.cpp
 WorldRunnable.h
 )
 
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/dep/include
+  ${CMAKE_SOURCE_DIR}/src/shared
+  ${CMAKE_SOURCE_DIR}/src/shared/Database
+  ${CMAKE_SOURCE_DIR}/src/framework
+  ${CMAKE_SOURCE_DIR}/src/game
+  ${MYSQL_INCLUDE_DIR}
+)
+
 SET(trinity-core_LINK_FLAGS "")
 
 add_executable(trinity-core ${trinity-core_SRCS})
diff --git a/src/trinityrealm/CMakeLists.txt b/src/trinityrealm/CMakeLists.txt
index b87ba0138a3..ebe8f9a53d7 100644
--- a/src/trinityrealm/CMakeLists.txt
+++ b/src/trinityrealm/CMakeLists.txt
@@ -13,6 +13,14 @@ RealmSocket.cpp
 RealmAcceptor.h
 )
 
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src/shared
+  ${CMAKE_SOURCE_DIR}/src/shared/Database
+  ${CMAKE_SOURCE_DIR}/src/framework
+  ${MYSQL_INCLUDE_DIR}
+)
+
 SET(trinity-realm_LINK_FLAGS "")
 
 add_executable(trinity-realm ${trinity-realm_SRCS})