Index: cmake/FindGEOS.cmake
===================================================================
--- cmake/FindGEOS.cmake	(revision 9104)
+++ cmake/FindGEOS.cmake	(working copy)
@@ -1,39 +1,119 @@
-
 # CMake module to search for GEOS library
 #
 # If it's found it sets GEOS_FOUND to TRUE
 # and following variables are set:
 #    GEOS_INCLUDE_DIR
 #    GEOS_LIBRARY
+#
+# Mateusz Loskot <mateusz@loskot.net>
+# (based in FindGDAL.cmake by Magnus Homann)
 
+IF(WIN32)
 
-# 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. 
-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_c.h)
+  IF (MINGW)
+    FIND_PATH(GEOS_INCLUDE_DIR geos_c.h /usr/local/include /usr/include c:/msys/local/include)
+    FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
+  ENDIF (MINGW)
 
-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_c)
+  IF (MSVC)
+    SET (
+       GEOS_INCLUDE_DIR 
+       "$ENV{LIB_DIR}/include"
+       CACHE STRING INTERNAL
+       )
+    SET (
+       GEOS_LIBRARY 
+       "$ENV{LIB_DIR}/lib/geos_c.lib";odbc32;odbccp32 
+       CACHE STRING INTERNAL)
+  ENDIF (MSVC)
+  
+ELSE(WIN32)
 
+ IF(UNIX) 
+
+    # try to use framework on mac
+    IF (APPLE)
+      SET (GEOS_MAC_PATH /Library/Frameworks/GEOS.framework/unix/bin)
+    ENDIF (APPLE)
+
+    SET(GEOS_CONFIG_PREFER_PATH "$ENV{GEOS_HOME}/bin" CACHE STRING "preferred path to GEOS (geos-config)")
+    FIND_PROGRAM(GEOS_CONFIG geos-config
+      ${GEOS_CONFIG_PREFER_PATH}
+      ${GEOS_MAC_PATH}
+      /usr/local/bin/
+      /usr/bin/
+      )
+    #MESSAGE("DBG GEOS_CONFIG ${GEOS_CONFIG}")
+
+    IF (GEOS_CONFIG) 
+      # set INCLUDE_DIR to prefix+include
+      EXEC_PROGRAM(${GEOS_CONFIG}
+        ARGS --prefix
+        OUTPUT_VARIABLE GEOS_PREFIX)
+
+      FIND_PATH(GEOS_INCLUDE_DIR 
+        geos_c.h 
+        ${GEOS_PREFIX}/include
+        /usr/local/include 
+        /usr/include 
+        )
+
+      ## extract link dirs for rpath  
+      EXEC_PROGRAM(${GEOS_CONFIG}
+        ARGS --libs
+        OUTPUT_VARIABLE GEOS_CONFIG_LIBS )
+
+      ## split off the link dirs (for rpath)
+      ## use regular expression to match wildcard equivalent "-L*<endchar>"
+      ## with <endchar> is a space or a semicolon
+      STRING(REGEX MATCHALL "[-][L]([^ ;])+" 
+        GEOS_LINK_DIRECTORIES_WITH_PREFIX 
+        "${GEOS_CONFIG_LIBS}" )
+      #MESSAGE("DBG  GEOS_LINK_DIRECTORIES_WITH_PREFIX=${GEOS_LINK_DIRECTORIES_WITH_PREFIX}")
+
+      ## remove prefix -L because we need the pure directory for LINK_DIRECTORIES
+      
+      IF (GEOS_LINK_DIRECTORIES_WITH_PREFIX)
+        STRING(REGEX REPLACE "[-][L]" "" GEOS_LINK_DIRECTORIES ${GEOS_LINK_DIRECTORIES_WITH_PREFIX} )
+      ENDIF (GEOS_LINK_DIRECTORIES_WITH_PREFIX)
+
+      ### XXX - mloskot: geos-config --libs does not return -lgeos_c, so set it manually
+      ## split off the name
+      ## use regular expression to match wildcard equivalent "-l*<endchar>"
+      ## with <endchar> is a space or a semicolon
+      #STRING(REGEX MATCHALL "[-][l]([^ ;])+" 
+      #  GEOS_LIB_NAME_WITH_PREFIX 
+      #  "${GEOS_CONFIG_LIBS}" )
+      #MESSAGE("DBG  GEOS_CONFIG_LIBS=${GEOS_CONFIG_LIBS}")
+      #MESSAGE("DBG  GEOS_LIB_NAME_WITH_PREFIX=${GEOS_LIB_NAME_WITH_PREFIX}")
+      SET(GEOS_LIB_NAME_WITH_PREFIX -lgeos_c CACHE STRING INTERNAL)
+
+      ## remove prefix -l because we need the pure name
+      
+      IF (GEOS_LIB_NAME_WITH_PREFIX)
+        STRING(REGEX REPLACE "[-][l]" "" GEOS_LIB_NAME ${GEOS_LIB_NAME_WITH_PREFIX} )
+      ENDIF (GEOS_LIB_NAME_WITH_PREFIX)
+      #MESSAGE("DBG  GEOS_LIB_NAME=${GEOS_LIB_NAME}")
+
+      IF (APPLE)
+        SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL)
+      ELSE (APPLE)
+       SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.so CACHE STRING INTERNAL)
+      ENDIF (APPLE)
+      #MESSAGE("DBG  GEOS_LIBRARY=${GEOS_LIBRARY}")
+      
+    ELSE(GEOS_CONFIG)
+      MESSAGE("FindGEOS.cmake: geos-config not found. Please set it manually. GEOS_CONFIG=${GEOS_CONFIG}")
+    ENDIF(GEOS_CONFIG)
+
+  ENDIF(UNIX)
+ENDIF(WIN32)
+
+
 IF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
    SET(GEOS_FOUND TRUE)
 ENDIF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
 
-
 IF (GEOS_FOUND)
 
    IF (NOT GEOS_FIND_QUIETLY)
@@ -42,8 +122,8 @@
 
 ELSE (GEOS_FOUND)
 
-   IF (GEOS_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find GEOS")
-   ENDIF (GEOS_FIND_REQUIRED)
+   MESSAGE(GEOS_INCLUDE_DIR=${GEOS_INCLUDE_DIR})
+   MESSAGE(GEOS_LIBRARY=${GEOS_LIBRARY})
+   MESSAGE(FATAL_ERROR "Could not find GEOS")
 
 ENDIF (GEOS_FOUND)