Skip to content

Commit 02652d7

Browse files
author
timlinux
committed
Find postgresql libs when they are in the qgislibs archive and LIB_DIR os set (MSVC)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7633 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 364200f commit 02652d7

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

cmake/FindPostgres.cmake

+12-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,21 @@
1111

1212
IF(WIN32)
1313
IF (NOT POSTGRES_INCLUDE_DIR)
14-
FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h /usr/local/include /usr/include c:/msys/local/include)
14+
FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h
15+
/usr/local/include
16+
/usr/include
17+
c:/msys/local/include
18+
"$ENV{LIB_DIR}/include/postgresql"
19+
)
1520
ENDIF (NOT POSTGRES_INCLUDE_DIR)
1621

1722
IF (NOT POSTGRES_LIBRARY)
18-
FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
23+
FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq PATHS
24+
/usr/local/lib
25+
/usr/lib
26+
c:/msys/local/lib
27+
"$ENV{LIB_DIR}/lib"
28+
)
1929
ENDIF (NOT POSTGRES_LIBRARY)
2030

2131
ELSE(WIN32)

0 commit comments

Comments
 (0)