QgsGeometry migrated to GEOS C-API

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9093 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 20, 2008 · 2fb8915 · 2fb8915
1 parent 87d9cb9
commit 2fb8915
Show file tree

Hide file tree

Showing 3 changed files with 1,146 additions and 1,283 deletions.
diff --git a/cmake/FindGEOS.cmake b/cmake/FindGEOS.cmake
@@ -13,21 +13,21 @@
 # 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(GEOS_INCLUDE_DIR geos.h
+FIND_PATH(GEOS_INCLUDE_DIR geos_c.h
   "$ENV{LIB_DIR}/include"
   #mingw
   c:/msys/local/include
   NO_DEFAULT_PATH
   )
-FIND_PATH(GEOS_INCLUDE_DIR geos.h)
+FIND_PATH(GEOS_INCLUDE_DIR geos_c.h)
 
-FIND_LIBRARY(GEOS_LIBRARY NAMES geos PATHS 
+FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS 
   "$ENV{LIB_DIR}/lib"
   #mingw
   c:/msys/local/lib
   NO_DEFAULT_PATH
   )
-FIND_LIBRARY(GEOS_LIBRARY NAMES geos)
+FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c)
 
 IF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
    SET(GEOS_FOUND TRUE)