Skip to content

Commit 08f1a8c

Browse files
author
timlinux
committed
For mac use dylib instead of .so for default libgdal and libpq extensions
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6644 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 549e70c commit 08f1a8c

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

cmake/FindGDAL.cmake

+5-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,11 @@ ELSE(WIN32)
7373
STRING(REGEX REPLACE "[-][l]" "" GDAL_LIB_NAME ${GDAL_LIB_NAME_WITH_PREFIX} )
7474
ENDIF (GDAL_LIB_NAME_WITH_PREFIX)
7575

76-
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.so CACHE STRING INTERNAL)
76+
IF (APPLE)
77+
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL)
78+
ELSEIF (APPLE)
79+
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.so CACHE STRING INTERNAL)
80+
ENDIF (APPLE)
7781

7882
ELSE(GDAL_CONFIG)
7983
MESSAGE("FindGDAL.cmake: gdal-config not found. Please set it manually. GDAL_CONFIG=${GDAL_CONFIG}")

cmake/FindPostgres.cmake

+5-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ ELSE(WIN32)
3939
EXEC_PROGRAM(${POSTGRES_CONFIG}
4040
ARGS --libdir
4141
OUTPUT_VARIABLE PG_TMP)
42-
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
42+
IF (APPLE)
43+
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL)
44+
ELSEIF (APPLE)
45+
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
46+
ENDIF (APPLE)
4347
ENDIF(POSTGRES_CONFIG)
4448

4549
ENDIF(UNIX)

0 commit comments

Comments
 (0)