diff --git a/cmake/FindGDAL.cmake b/cmake/FindGDAL.cmake index ce35fd47de7..702c5be327b 100644 --- a/cmake/FindGDAL.cmake +++ b/cmake/FindGDAL.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}") diff --git a/cmake/FindGRASS.cmake b/cmake/FindGRASS.cmake index 8dd39f260e2..2c549948704 100644 --- a/cmake/FindGRASS.cmake +++ b/cmake/FindGRASS.cmake @@ -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}) diff --git a/cmake/FindGSL.cmake b/cmake/FindGSL.cmake index 04abd0530bc..1fa42abe4ae 100644 --- a/cmake/FindGSL.cmake +++ b/cmake/FindGSL.cmake @@ -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}")