Merge

--HG-- branch : trunk
2009-11-04 18:19:46 +01:00
parent d12a79807d 5120249512
commit 880d5a6d13
3 changed files with 4 additions and 6 deletions
@@ -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}
@@ -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}
 )

@@ -41,8 +41,6 @@ gomp
 ${SSLLIB}
 ${MYSQL_LIBRARIES}
 ${POSTGRESQL_LIBRARIES}
-${POSTGRESQL_INCLUDE_DIR}/libpq-4/
-${POSTGRESQL_INCLUDE_DIR}/libpq-4/server/
 ${OSX_LIBS}
 )