Merge.

--HG--
branch : trunk

src/framework/CMakeLists.txt

@@ -4,6 +4,7 @@ SET(trinityframework_STAT_SRCS
 )
 
 include_directories(
+  ${ACE_INCLUDE_DIR}
   ${CMAKE_SOURCE_DIR}/src/framework
 )
 

src/game/CMakeLists.txt

@@ -310,6 +310,7 @@ SET(game_STAT_SRCS
 )
 
 include_directories(
+  ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/dep/include
   ${CMAKE_SOURCE_DIR}/src/framework

src/scripts/CMakeLists.txt

@@ -569,6 +569,7 @@ SET(scripts_STAT_SRCS
 message("-- Added Script Engine to SCRIPTS lib")
 
 include_directories(
+  ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/src/shared
   ${CMAKE_SOURCE_DIR}/src/framework

src/shared/Auth/CMakeLists.txt

@@ -17,6 +17,7 @@ SET(trinityauth_STAT_SRCS
 )
 
 include_directories(
+  ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/src/shared
   ${CMAKE_SOURCE_DIR}/src/framework

src/shared/CMakeLists.txt

@@ -25,6 +25,7 @@ SET(shared_STAT_SRCS
 )
 
 include_directories(
+  ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/dep/include
   ${CMAKE_SOURCE_DIR}/dep/include/sockets

src/shared/Config/CMakeLists.txt

@@ -12,6 +12,7 @@ SET(trinityconfig_STAT_SRCS
 )
 
 include_directories(
+  ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/src/shared
   ${CMAKE_SOURCE_DIR}/src/framework

src/shared/Database/CMakeLists.txt

@@ -28,6 +28,7 @@ SET(trinitydatabase_STAT_SRCS
 )
 
 include_directories(
+  ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/src/shared
   ${CMAKE_SOURCE_DIR}/src/shared/Database

src/trinitycore/CMakeLists.txt

@@ -14,6 +14,7 @@ WorldRunnable.h
 )
 
 include_directories(
+  ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/dep/include
   ${CMAKE_SOURCE_DIR}/src/shared

src/trinityrealm/CMakeLists.txt

@@ -14,6 +14,7 @@ RealmAcceptor.h
 )
 
 include_directories(
+  ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/src/shared
   ${CMAKE_SOURCE_DIR}/src/shared/Database