Skip to content
Permalink
Browse files
Backported find rules for pg and gdal from trunk
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_8_0@7023 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Jun 11, 2007
1 parent 1cffc12 commit 4121989dc6cdd4929c1e0d2898b42a14824b6cbd
Showing with 13 additions and 5 deletions.
  1. +8 −4 cmake/FindGDAL.cmake
  2. +5 −1 cmake/FindPostgres.cmake
@@ -73,7 +73,11 @@ ELSE(WIN32)
STRING(REGEX REPLACE "[-][l]" "" GDAL_LIB_NAME ${GDAL_LIB_NAME_WITH_PREFIX} )
ENDIF (GDAL_LIB_NAME_WITH_PREFIX)

SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.so CACHE STRING INTERNAL)
IF (APPLE)
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL)
ELSE (APPLE)
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.so CACHE STRING INTERNAL)
ENDIF (APPLE)

ELSE(GDAL_CONFIG)
MESSAGE("FindGDAL.cmake: gdal-config not found. Please set it manually. GDAL_CONFIG=${GDAL_CONFIG}")
@@ -95,8 +99,8 @@ IF (GDAL_FOUND)

ELSE (GDAL_FOUND)

IF (GDAL_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find GDAL")
ENDIF (GDAL_FIND_REQUIRED)
MESSAGE(GDAL_INCLUDE_DIR=${GDAL_INCLUDE_DIR})
MESSAGE(GDAL_LIBRARY=${GDAL_LIBRARY})
MESSAGE(FATAL_ERROR "Could not find GDAL")

ENDIF (GDAL_FOUND)
@@ -39,7 +39,11 @@ ELSE(WIN32)
EXEC_PROGRAM(${POSTGRES_CONFIG}
ARGS --libdir
OUTPUT_VARIABLE PG_TMP)
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
IF (APPLE)
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL)
ELSE (APPLE)
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
ENDIF (APPLE)
ENDIF(POSTGRES_CONFIG)

ENDIF(UNIX)

0 comments on commit 4121989

Please sign in to comment.