Skip to content
Permalink
Browse files
Ported r6515 to 0.8
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_8_0@6517 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
homann committed Feb 4, 2007
1 parent 2d99590 commit f671419289f872f6ab51f485bc0606df9b05a783
Showing with 15 additions and 1 deletion.
  1. +8 −0 cmake/FindGDAL.cmake
  2. +5 −0 cmake/FindGRASS.cmake
  3. +2 −1 cmake/FindGSL.cmake
@@ -17,9 +17,17 @@ IF(WIN32)

ELSE(WIN32)
IF(UNIX)

# try to use framework on mac
IF (APPLE)
SET (GDAL_MAC_PATH /Library/Frameworks/GDAL.framework/unix/bin)
ENDIF (APPLE)

SET(GDAL_CONFIG_PREFER_PATH "$ENV{GDAL_HOME}/bin" CACHE STRING "preferred path to GDAL (gdal-config)")
FIND_PROGRAM(GDAL_CONFIG gdal-config
${GDAL_CONFIG_PREFER_PATH}
${GDAL_MAC_PATH}
/usr/local/bin/
/usr/bin/
)
# MESSAGE("DBG GDAL_CONFIG ${GDAL_CONFIG}")
@@ -41,6 +41,11 @@ ENDMACRO (CHECK_GRASS)
# list of paths which to search - user's choice as first
SET (GRASS_PATHS ${GRASS_PREFIX} /usr/lib/grass)

# mac-specific path
IF (APPLE)
SET (GRASS_PATHS ${GRASS_PATHS} /Applications/GRASS.app/Contents/Resources)
ENDIF (APPLE)

IF (WITH_GRASS)

FOREACH (G_PREFIX ${GRASS_PATHS})
@@ -25,7 +25,7 @@

IF(WIN32)

SET(GSL_PREFIX "" CACHE PATH "Path to GSL directory")
SET(GSL_PREFIX "c:/msys/local" CACHE PATH "Path to GSL directory")

FIND_LIBRARY(GSL_LIB gsl PATH ${GSL_PREFIX}/lib)
FIND_LIBRARY(GSLCBLAS_LIB gslcblas PATH ${GSL_PREFIX}/lib)
@@ -41,6 +41,7 @@ ELSE(WIN32)
SET(GSL_CONFIG_PREFER_PATH "$ENV{GSL_HOME}/bin" CACHE STRING "preferred path to GSL (gsl-config)")
FIND_PROGRAM(GSL_CONFIG gsl-config
${GSL_CONFIG_PREFER_PATH}
/usr/local/bin/
/usr/bin/
)
# MESSAGE("DBG GSL_CONFIG ${GSL_CONFIG}")

0 comments on commit f671419

Please sign in to comment.