Added convenience paths for dependency search on windows (expecting c…

…:/msys) git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6453 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 23, 2007 · c3736d3 · c3736d3
1 parent cdfd9b2
commit c3736d3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/cmake/FindExpat.cmake b/cmake/FindExpat.cmake
@@ -8,9 +8,9 @@
 #    EXPAT_LIBRARY
 
 
-FIND_PATH(EXPAT_INCLUDE_DIR expat.h /usr/local/include /usr/include)
+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)
+FIND_LIBRARY(EXPAT_LIBRARY NAMES expat PATH /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
@@ -11,8 +11,8 @@
 
 IF(WIN32)
 
-  FIND_PATH(GDAL_INCLUDE_DIR gdal.h /usr/local/include /usr/include)
-  FIND_LIBRARY(GDAL_LIBRARY NAMES gdal PATH /usr/local/lib /usr/lib)
+  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)
 
 
 ELSE(WIN32)

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

diff --git a/cmake/FindPostgres.cmake b/cmake/FindPostgres.cmake
@@ -11,11 +11,11 @@
 
 IF(WIN32)
   IF (NOT POSTGRES_INCLUDE_DIR)
-    FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h /usr/local/include /usr/include)
+    FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h /usr/local/include /usr/include c:/msys/local/include)
   ENDIF (NOT POSTGRES_INCLUDE_DIR)
 
   IF (NOT POSTGRES_LIBRARY)
-    FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq PATH /usr/local/lib /usr/lib)
+    FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq PATH /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
@@ -7,9 +7,9 @@
 #    PROJ_LIBRARY
 
 
-FIND_PATH(PROJ_INCLUDE_DIR proj_api.h /usr/local/include /usr/include)
+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)
+FIND_LIBRARY(PROJ_LIBRARY NAMES proj PATH /usr/local/lib /usr/lib c:/msys/local/include)
 
 IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
    SET(PROJ_FOUND TRUE)

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