From b19c7b0d850eb246f4f66c9dc5dfa4515e4f3ea6 Mon Sep 17 00:00:00 2001 From: tartalo Date: Wed, 4 Nov 2009 18:12:19 +0100 Subject: [PATCH] Fix compile un *NIX, closes #53 --HG-- branch : trunk --- CMakeLists.txt | 4 +++- src/trinitycore/CMakeLists.txt | 4 +--- src/trinityrealm/CMakeLists.txt | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4935404cc45..d2d6deb9571 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -188,7 +188,9 @@ src/bindings/scripts/base ${CMAKE_BINARY_DIR} ${SCRIPT_INCLUDE} ${MYSQL_INCLUDE_DIR} -${POSTGRESQL_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} diff --git a/src/trinitycore/CMakeLists.txt b/src/trinitycore/CMakeLists.txt index 3b1bdf20f47..ab707fcac79 100644 --- a/src/trinitycore/CMakeLists.txt +++ b/src/trinitycore/CMakeLists.txt @@ -52,11 +52,9 @@ gomp ${SCRIPT_LIB} ${MYSQL_LIBRARIES} ${POSTGRESQL_LIBRARIES} -${POSTGRESQL_INCLUDE_DIR}/libpq-4/ -${POSTGRESQL_INCLUDE_DIR}/libpq-4/server/ ${SSLLIB} ${ACE_LIBRARY} -${ZLIB} +${ZLIB} ${OSX_LIBS} ) diff --git a/src/trinityrealm/CMakeLists.txt b/src/trinityrealm/CMakeLists.txt index 0f38036a5b0..85c2120b5da 100644 --- a/src/trinityrealm/CMakeLists.txt +++ b/src/trinityrealm/CMakeLists.txt @@ -41,8 +41,6 @@ gomp ${SSLLIB} ${MYSQL_LIBRARIES} ${POSTGRESQL_LIBRARIES} -${POSTGRESQL_INCLUDE_DIR}/libpq-4/ -${POSTGRESQL_INCLUDE_DIR}/libpq-4/server/ ${OSX_LIBS} )