Skip to content

Commit 935d566

Browse files
author
jef
committed
QgsGeometry migrated to GEOS C-API
git-svn-id: http://svn.osgeo.org/qgis/trunk@9093 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 43278d7 commit 935d566

File tree

3 files changed

+1146
-1283
lines changed

3 files changed

+1146
-1283
lines changed

cmake/FindGEOS.cmake

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@
1313
# and then again with no specified paths to search the default
1414
# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
1515
# searching for the same item do nothing.
16-
FIND_PATH(GEOS_INCLUDE_DIR geos.h
16+
FIND_PATH(GEOS_INCLUDE_DIR geos_c.h
1717
"$ENV{LIB_DIR}/include"
1818
#mingw
1919
c:/msys/local/include
2020
NO_DEFAULT_PATH
2121
)
22-
FIND_PATH(GEOS_INCLUDE_DIR geos.h)
22+
FIND_PATH(GEOS_INCLUDE_DIR geos_c.h)
2323

24-
FIND_LIBRARY(GEOS_LIBRARY NAMES geos PATHS
24+
FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS
2525
"$ENV{LIB_DIR}/lib"
2626
#mingw
2727
c:/msys/local/lib
2828
NO_DEFAULT_PATH
2929
)
30-
FIND_LIBRARY(GEOS_LIBRARY NAMES geos)
30+
FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c)
3131

3232
IF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
3333
SET(GEOS_FOUND TRUE)

0 commit comments

Comments
 (0)