Fix CMake search for libraries

git-svn-id: http://svn.osgeo.org/qgis/trunk@6522 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 4, 2007 · 9488c74 · 9488c74
1 parent 7ca9093
commit 9488c74
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/cmake/FindExpat.cmake b/cmake/FindExpat.cmake
@@ -10,7 +10,7 @@
 
 FIND_PATH(EXPAT_INCLUDE_DIR expat.h /usr/local/include /usr/include c:/msys/local/include)
 
-FIND_LIBRARY(EXPAT_LIBRARY NAMES expat PATH /usr/local/lib /usr/lib c:/msys/local/lib)
+FIND_LIBRARY(EXPAT_LIBRARY NAMES expat PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
 
 IF (EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY)
    SET(EXPAT_FOUND TRUE)

diff --git a/cmake/FindGDAL.cmake b/cmake/FindGDAL.cmake
@@ -12,7 +12,7 @@
 IF(WIN32)
 
   FIND_PATH(GDAL_INCLUDE_DIR gdal.h /usr/local/include /usr/include c:/msys/local/include)
-  FIND_LIBRARY(GDAL_LIBRARY NAMES gdal PATH /usr/local/lib /usr/lib c:/msys/local/lib)
+  FIND_LIBRARY(GDAL_LIBRARY NAMES gdal PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
 
 
 ELSE(WIN32)

diff --git a/cmake/FindGEOS.cmake b/cmake/FindGEOS.cmake
@@ -9,7 +9,7 @@
 
 FIND_PATH(GEOS_INCLUDE_DIR geos.h /usr/local/include /usr/include c:/msys/local/include)
 
-FIND_LIBRARY(GEOS_LIBRARY NAMES geos PATH /usr/local/lib /usr/lib c:/msys/local/include)
+FIND_LIBRARY(GEOS_LIBRARY NAMES geos PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
 
 IF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
    SET(GEOS_FOUND TRUE)

diff --git a/cmake/FindGRASS.cmake b/cmake/FindGRASS.cmake
@@ -39,7 +39,7 @@ ENDMACRO (CHECK_GRASS)
 # search for grass installations
 
 # list of paths which to search - user's choice as first
-SET (GRASS_PATHS ${GRASS_PREFIX} /usr/lib/grass)
+SET (GRASS_PATHS ${GRASS_PREFIX} /usr/lib/grass c:/msys/local/grass-6.3.cvs)
 
 # mac-specific path
 IF (APPLE)
@@ -76,7 +76,7 @@ IF (GRASS_FOUND)
 
   # add 'util' library to the dependencies
   IF (HAVE_OPENPTY)
-    FIND_LIBRARY(OPENPTY_LIBRARY NAMES util PATH /usr/local/lib /usr/lib)
+    FIND_LIBRARY(OPENPTY_LIBRARY NAMES util PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
     SET (GRASS_LIBRARIES ${GRASS_LIBRARIES} ${OPENPTY_LIBRARY})
   ENDIF (HAVE_OPENPTY)
 

diff --git a/cmake/FindGSL.cmake b/cmake/FindGSL.cmake
@@ -27,8 +27,8 @@ IF(WIN32)
 
   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)
+  FIND_LIBRARY(GSL_LIB gsl PATHS ${GSL_PREFIX}/lib)
+  FIND_LIBRARY(GSLCBLAS_LIB gslcblas PATHS ${GSL_PREFIX}/lib)
 
   FIND_PATH(GSL_INCLUDE_DIR gsl/gsl_version.h ${GSL_PREFIX}/include)
 

diff --git a/cmake/FindPostgres.cmake b/cmake/FindPostgres.cmake
@@ -15,7 +15,7 @@ IF(WIN32)
   ENDIF (NOT POSTGRES_INCLUDE_DIR)
 
   IF (NOT POSTGRES_LIBRARY)
-    FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq PATH /usr/local/lib /usr/lib c:/msys/local/lib)
+    FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
   ENDIF (NOT POSTGRES_LIBRARY)
 
 ELSE(WIN32)

diff --git a/cmake/FindProj.cmake b/cmake/FindProj.cmake
@@ -9,7 +9,7 @@
 
 FIND_PATH(PROJ_INCLUDE_DIR proj_api.h /usr/local/include /usr/include c:/msys/local/include)
 
-FIND_LIBRARY(PROJ_LIBRARY NAMES proj PATH /usr/local/lib /usr/lib c:/msys/local/include)
+FIND_LIBRARY(PROJ_LIBRARY NAMES proj PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
 
 IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
    SET(PROJ_FOUND TRUE)

diff --git a/cmake/FindSqlite3.cmake b/cmake/FindSqlite3.cmake
@@ -9,7 +9,7 @@
 
 FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h /usr/local/include /usr/include c:/msys/local/include)
 
-FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 PATH /usr/local/lib /usr/lib c:/msys/local/lib)
+FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
 
 IF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
    SET(SQLITE3_FOUND TRUE)