From 4d68622b90aa70974e88ca933f88ca80d506181f Mon Sep 17 00:00:00 2001 From: Tartalo Date: Sun, 6 Jun 2010 13:47:00 +0200 Subject: [PATCH] And more fixes for cmake (not finished yet) --HG-- branch : trunk --- src/server/authserver/CMakeLists.txt | 6 +++--- src/server/game/CMakeLists.txt | 2 +- src/server/shared/CMakeLists.txt | 2 +- src/server/worldserver/CMakeLists.txt | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index 8f3e9b8754..5a993be537 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -16,9 +16,9 @@ RealmAcceptor.h include_directories( ${ACE_INCLUDE_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/src/shared - ${CMAKE_SOURCE_DIR}/src/shared/Database - ${CMAKE_SOURCE_DIR}/src/framework + ${CMAKE_SOURCE_DIR}/src/server/shared + ${CMAKE_SOURCE_DIR}/src/server/shared/Database + ${CMAKE_SOURCE_DIR}/src/server/framework ${MYSQL_INCLUDE_DIR} ) diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 9250426f53..2927b76ac5 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -353,6 +353,6 @@ ADD_DEPENDENCIES(game revision.h) # Generate precompiled header IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) - ADD_PRECOMPILED_HEADER(game ${CMAKE_SOURCE_DIR}/src/game/pchlinux.h) + ADD_PRECOMPILED_HEADER(game ${CMAKE_SOURCE_DIR}/src/server/game/pchlinux.h) ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index d00f8b83fb..a247d29072 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -30,7 +30,7 @@ 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/server/framework ${CMAKE_SOURCE_DIR}/src/shared ${MYSQL_INCLUDE_DIR} ) diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 0efdc63c09..bf31cd9bd7 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -17,10 +17,10 @@ include_directories( ${ACE_INCLUDE_DIR} ${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 + ${CMAKE_SOURCE_DIR}/src/server/shared + ${CMAKE_SOURCE_DIR}/src/server/shared/Database + ${CMAKE_SOURCE_DIR}/src/server/framework + ${CMAKE_SOURCE_DIR}/src/server/game ${MYSQL_INCLUDE_DIR} )