find more Mac frameworks; extra default search paths for postgres

git-svn-id: http://svn.osgeo.org/qgis/trunk@14385 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Oct 16, 2010 · bb0bcd2 · bb0bcd2
1 parent a7babd9
commit bb0bcd2
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 2 deletions.
diff --git a/cmake/FindGDAL.cmake b/cmake/FindGDAL.cmake
@@ -43,7 +43,7 @@ ELSE(WIN32)
 
     # try to use framework on mac
     IF (APPLE)
-      SET (GDAL_MAC_PATH /Library/Frameworks/GDAL.framework/unix/bin)
+      SET (GDAL_MAC_PATH /Library/Frameworks/GDAL.framework/Programs)
     ENDIF (APPLE)
 
     SET(GDAL_CONFIG_PREFER_PATH "$ENV{GDAL_HOME}/bin" CACHE STRING "preferred path to GDAL (gdal-config)")

diff --git a/cmake/FindGRASS.cmake b/cmake/FindGRASS.cmake
@@ -50,6 +50,7 @@ SET (GRASS_PATHS ${GRASS_PREFIX} /usr/lib/grass c:/msys/local /opt/grass)
 IF (APPLE)
   SET (GRASS_PATHS ${GRASS_PATHS}
     /Applications/GRASS-6.3.app/Contents/MacOS
+    /Applications/GRASS-6.4.app/Contents/MacOS
     /Applications/GRASS.app/Contents/Resources
   )
 ENDIF (APPLE)

diff --git a/cmake/FindGSL.cmake b/cmake/FindGSL.cmake
@@ -46,9 +46,14 @@ IF(WIN32)
   SET (GSL_LIBRARIES ${GSL_LIB} ${GSLCBLAS_LIB})
 ELSE(WIN32)
   IF(UNIX) 
+    # try to use framework on mac
+    IF (APPLE)
+      SET (GSL_MAC_PATH /Library/Frameworks/GSL.framework/Programs)
+    ENDIF (APPLE)
     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}
+      ${GSL_MAC_PATH}
       /usr/local/bin/
       /usr/bin/
       )

diff --git a/cmake/FindPostgres.cmake b/cmake/FindPostgres.cmake
@@ -40,6 +40,8 @@ ELSE(WIN32)
     SET(POSTGRES_CONFIG_PREFER_PATH "$ENV{POSTGRES_HOME}/bin" CACHE STRING "preferred path to PG (pg_config)")
     FIND_PROGRAM(POSTGRES_CONFIG pg_config
       ${POSTGRES_CONFIG_PREFER_PATH}
+      /usr/local/pgsql/bin/
+      /usr/local/bin/
       /usr/bin/
       )
     # MESSAGE("DBG POSTGRES_CONFIG ${POSTGRES_CONFIG}")

diff --git a/cmake/FindProj.cmake b/cmake/FindProj.cmake
@@ -11,16 +11,22 @@
 #    PROJ_INCLUDE_DIR
 #    PROJ_LIBRARY
 
-
 # FIND_PATH and FIND_LIBRARY normally search standard locations
 # before the specified paths. To search non-standard paths first,
 # FIND_* is invoked first with specified paths and NO_DEFAULT_PATH
 # and then again with no specified paths to search the default
 # locations. When an earlier FIND_* succeeds, subsequent FIND_*s
 # searching for the same item do nothing. 
+
+# try to use framework on mac
+IF (APPLE)
+  SET (PROJ_MAC_INC_PATH /Library/Frameworks/PROJ.framework/Headers)
+ENDIF (APPLE)
+
 FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
   "$ENV{LIB_DIR}/include/proj"
   "$ENV{LIB_DIR}/include"
+  ${PROJ_MAC_INC_PATH}
   #mingw
   c:/msys/local/include
   NO_DEFAULT_PATH

diff --git a/cmake/FindSPATIALITE.cmake b/cmake/FindSPATIALITE.cmake
@@ -18,9 +18,12 @@
 # and then again with no specified paths to search the default
 # locations. When an earlier FIND_* succeeds, subsequent FIND_*s
 # searching for the same item do nothing. 
+
 FIND_PATH(SPATIALITE_INCLUDE_DIR spatialite.h
   "$ENV{LIB_DIR}/include"
   "$ENV{LIB_DIR}/include/spatialite"
+  # try to use SQLite3 framework on mac, should be set from SQLite3 check
+  ${SQLITE3_MAC_INC_PATH}
   #mingw
   c:/msys/local/include
   NO_DEFAULT_PATH

diff --git a/cmake/FindSqlite3.cmake b/cmake/FindSqlite3.cmake
@@ -18,9 +18,16 @@
 # and then again with no specified paths to search the default
 # locations. When an earlier FIND_* succeeds, subsequent FIND_*s
 # searching for the same item do nothing. 
+
+# try to use framework on mac
+IF (APPLE)
+  SET (SQLITE3_MAC_INC_PATH /Library/Frameworks/SQLite3.framework/Headers)
+ENDIF (APPLE)
+
 FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
   "$ENV{LIB_DIR}/include"
   "$ENV{LIB_DIR}/include/sqlite"
+  ${SQLITE3_MAC_INC_PATH}
   #mingw
   c:/msys/local/include
   NO_DEFAULT_PATH