Branch merge

--HG--
branch : trunk

CMakeLists.txt

@@ -168,25 +168,6 @@ ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
 add_definitions(--no-warnings) #to make build look nice, no gcc nazi warnings.
 
-INCLUDE_DIRECTORIES(
-dep/include 
-dep/include/g3dlite 
-dep/include/sockets
-src/shared 
-src/framework 
-src/shared/Database 
-src/shared/vmap
-src/game 
-${CMAKE_BINARY_DIR}
-${MYSQL_INCLUDE_DIR} 
-${POSTGRESQL_INCLUDE_DIR}
-${POSTGRESQL_INCLUDE_DIR}/libpq-4/
-${POSTGRESQL_INCLUDE_DIR}/libpq-4/server/ 
-${CMAKE_CURRENT_BINARY_DIR}/src/shared 
-${CMAKE_CURRENT_SOURCE_DIR}/..
-${ACE_INCLUDE_DIR}
-)
-
 SET(CMAKE_SKIP_BUILD_RPATH FALSE)
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")

dep/src/g3dlite/CMakeLists.txt

@@ -14,6 +14,10 @@ SET(g3dlite_STAT_SRCS
    Vector4.cpp
 )
 
+include_directories(
+  ${CMAKE_SOURCE_DIR}/dep/include/g3dlite
+)
+
 add_library(g3dlite STATIC ${g3dlite_STAT_SRCS})
 
 

dep/src/sockets/CMakeLists.txt

@@ -19,4 +19,8 @@ SET(trinitysockets_STAT_SRCS
    socket_include.cpp
 )
 
+include_directories(
+  ${CMAKE_SOURCE_DIR}/dep/include/sockets
+)
+
 add_library(trinitysockets STATIC ${trinitysockets_STAT_SRCS})

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})

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

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})
 

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})

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

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})
 

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})

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})
 

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})

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})