Merge remote-tracking branch 'origin/PostgreSQLonTravisAndAppVeyor' into PostgreSQLonTravisAndAppVeyor

This commit is contained in:
FrancisANDRE
2016-03-06 08:26:11 +01:00

View File

@@ -28,7 +28,7 @@ FIND_PATH(PGSQL_INCLUDE_DIR libpq-fe.h
/usr/postgresql/include
)
SET(PGSQL_NAMES pq libpq)
SET(PGSQL_NAMES pq libpq libpg.so.5.7)
SET(PGSQL_SEARCH_LIB_PATHS
${PGSQL_SEARCH_LIB_PATHS}
$ENV{ProgramFiles}/PostgreSQL/*/lib
@@ -36,8 +36,11 @@ SET(PGSQL_SEARCH_LIB_PATHS
$ENV{SystemDrive}/PostgreSQL/*/lib
$ENV{SystemDrive}/PostgreSQL/*/*/lib
/usr/local/pgsql/lib
/usr/local/pgsql/lib64
/usr/local/lib
/usr/local/lib64
/usr/lib
/usr/lib64
)
FIND_LIBRARY(PGSQL_LIBRARY
NAMES ${PGSQL_NAMES}
@@ -67,4 +70,4 @@ MARK_AS_ADVANCED(
PGSQL_LIBRARY
PGSQL_INCLUDE_DIR
)
ENDMACRO(FIND_PGSQL)
ENDMACRO(FIND_PGSQL)