[QGIS Commit] r10288 - trunk/qgis/cmake

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2009-03-17 07:42:50 -0400 (Tue, 17 Mar 2009)
New Revision: 10288

Modified:
   trunk/qgis/cmake/FindGDAL.cmake
   trunk/qgis/cmake/FindGEOS.cmake
   trunk/qgis/cmake/FindPostgres.cmake
   trunk/qgis/cmake/FindSqlite3.cmake
Log:
Tweaks to make cmake find the sqlite3, pq, gdal and geos dependencies when using LIB_DIR and osgeo4w dependencies

Modified: trunk/qgis/cmake/FindGDAL.cmake
===================================================================
--- trunk/qgis/cmake/FindGDAL.cmake	2009-03-16 14:22:45 UTC (rev 10287)
+++ trunk/qgis/cmake/FindGDAL.cmake	2009-03-17 11:42:50 UTC (rev 10288)
@@ -22,10 +22,13 @@
        "$ENV{LIB_DIR}/include/gdal"
        CACHE STRING INTERNAL
        )
-    SET (
-       GDAL_LIBRARY 
-       "$ENV{LIB_DIR}/lib/gdal.lib";odbc32;odbccp32 
-       CACHE STRING INTERNAL)
+    FIND_LIBRARY(GDAL_LIBRARY NAMES gdal gdal_i PATHS 
+      "$ENV{LIB_DIR}/lib" /usr/lib c:/msys/local/lib)
+    IF (GDAL_LIBRARY)
+      SET (
+         GDAL_LIBRARY;odbc32;odbccp32 
+         CACHE STRING INTERNAL)
+    ENDIF (GDAL_LIBRARY)
   ENDIF (MSVC)
   
   

Modified: trunk/qgis/cmake/FindGEOS.cmake
===================================================================
--- trunk/qgis/cmake/FindGEOS.cmake	2009-03-16 14:22:45 UTC (rev 10287)
+++ trunk/qgis/cmake/FindGEOS.cmake	2009-03-17 11:42:50 UTC (rev 10288)
@@ -21,10 +21,18 @@
        "$ENV{LIB_DIR}/include"
        CACHE STRING INTERNAL
        )
-    SET (
-       GEOS_LIBRARY 
-       "$ENV{LIB_DIR}/lib/geos_c.lib";odbc32;odbccp32 
-       CACHE STRING INTERNAL)
+    FIND_LIBRARY(GEOS_LIBRARY NAMES geos geos_c_i PATHS 
+      "$ENV{LIB_DIR}/lib"
+      #mingw
+      c:/msys/local/lib
+      NO_DEFAULT_PATH
+      )
+    IF (GEOS_LIBRARY)
+       SET (
+         GEOS_LIBRARY 
+         GEOS_LIBRARY;odbc32;odbccp32 
+         CACHE STRING INTERNAL)
+    ENDIF (GEOS_LIBRARY)
   ENDIF (MSVC)
   
 ELSE(WIN32)

Modified: trunk/qgis/cmake/FindPostgres.cmake
===================================================================
--- trunk/qgis/cmake/FindPostgres.cmake	2009-03-16 14:22:45 UTC (rev 10287)
+++ trunk/qgis/cmake/FindPostgres.cmake	2009-03-17 11:42:50 UTC (rev 10288)
@@ -16,11 +16,12 @@
       /usr/include 
       c:/msys/local/include
       "$ENV{LIB_DIR}/include/postgresql"
+      "$ENV{LIB_DIR}/include"
       )
   ENDIF (NOT POSTGRES_INCLUDE_DIR)
 
   IF (NOT POSTGRES_LIBRARY)
-    FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq PATHS 
+    FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq libpqdll PATHS 
       /usr/local/lib 
       /usr/lib 
       c:/msys/local/lib
@@ -61,13 +62,11 @@
 
 IF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
    SET(POSTGRES_FOUND TRUE)
-
    IF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
      SET(HAVE_PGCONFIG TRUE)
    ELSE(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
      SET(HAVE_PGCONFIG FALSE)
    ENDIF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
-   
 ENDIF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
 
 

Modified: trunk/qgis/cmake/FindSqlite3.cmake
===================================================================
--- trunk/qgis/cmake/FindSqlite3.cmake	2009-03-16 14:22:45 UTC (rev 10287)
+++ trunk/qgis/cmake/FindSqlite3.cmake	2009-03-17 11:42:50 UTC (rev 10288)
@@ -22,7 +22,7 @@
   )
 FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h)
 
-FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 PATHS
+FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_i PATHS
   "$ENV{LIB_DIR}/lib"
   #mingw
   c:/msys/local/lib