Skip to content

Commit

Permalink
For 1.1 release we need geos 3.0.0 or later so make sure the user has…
Browse files Browse the repository at this point in the history
… it.

GEOS 3 is required by PAL, simplify method of QgsGeometry and probably also spatialite.


git-svn-id: http://svn.osgeo.org/qgis/trunk@10562 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder committed Apr 14, 2009
1 parent 94793e7 commit 5450e64
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion cmake/FindGEOS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,18 @@ ELSE(WIN32)
)
#MESSAGE("DBG GEOS_CONFIG ${GEOS_CONFIG}")

IF (GEOS_CONFIG)
IF (GEOS_CONFIG)

EXEC_PROGRAM(${GEOS_CONFIG}
ARGS --version
OUTPUT_VARIABLE GEOS_VERSION)
STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1" GEOS_VERSION_MAJOR "${GEOS_VERSION}")
STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2" GEOS_VERSION_MINOR "${GEOS_VERSION}")

IF (GEOS_VERSION_MAJOR LESS 3)
MESSAGE (FATAL_ERROR "GEOS version is too old (${GEOS_VERSION}). Use 3.0.0 or higher.")
ENDIF (GEOS_VERSION_MAJOR LESS 3)

# set INCLUDE_DIR to prefix+include
EXEC_PROGRAM(${GEOS_CONFIG}
ARGS --prefix
Expand Down

0 comments on commit 5450e64

Please sign in to comment.