diff options
| author | Machiavelli <none@none> | 2009-11-04 18:19:46 +0100 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-11-04 18:19:46 +0100 |
| commit | 880d5a6d13b32dd49f713001a46fa41272735e08 (patch) | |
| tree | c08f6175f4e1dac73790fcbea3c74a45642f336b | |
| parent | d12a79807da28e717d055c8f3a286fb9aa71de31 (diff) | |
| parent | 51202495129c7afd4bf2e22dc590e7ab88332d27 (diff) | |
Merge
--HG--
branch : trunk
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/trinitycore/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | 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} ) |