@@ -23,11 +23,16 @@ IF(WIN32)
23
23
IF (MINGW )
24
24
FIND_PATH (GEOS_INCLUDE_DIR geos_c.h /usr/local/include /usr/include c:/msys/local/include )
25
25
FIND_LIBRARY (GEOS_LIBRARY NAMES geos_c PATHS /usr/local/lib /usr/lib c:/msys/local/lib )
26
+ FIND_LIBRARY (GEOS_CPP_LIBRARY NAMES geos PATHS /usr/local/lib /usr/lib c:/msys/local/lib )
26
27
ENDIF (MINGW )
27
28
28
29
IF (MSVC )
29
30
FIND_PATH (GEOS_INCLUDE_DIR geos_c.h $ENV{LIB_DIR} /include $ENV{INCLUDE} )
30
- FIND_LIBRARY (GEOS_LIBRARY NAMES geos geos_c_i geos_c PATHS
31
+ FIND_LIBRARY (GEOS_LIBRARY NAMES geos_c_i geos_c PATHS
32
+ "$ENV{LIB_DIR} /lib"
33
+ $ENV{LIB}
34
+ )
35
+ FIND_LIBRARY (GEOS_CPP_LIBRARY NAMES geos PATHS
31
36
"$ENV{LIB_DIR} /lib"
32
37
$ENV{LIB}
33
38
)
@@ -67,6 +72,7 @@ ELSE(WIN32)
67
72
68
73
IF (CYGWIN )
69
74
FIND_LIBRARY (GEOS_LIBRARY NAMES geos_c PATHS /usr/lib /usr/local/lib )
75
+ FIND_LIBRARY (GEOS_CPP_LIBRARY NAMES geos PATHS /usr/lib /usr/local/lib )
70
76
ENDIF (CYGWIN )
71
77
72
78
IF (NOT GEOS_INCLUDE_DIR OR NOT GEOS_LIBRARY OR NOT GEOS_CONFIG )
@@ -132,12 +138,16 @@ ELSE(WIN32)
132
138
#MESSAGE("DBG GEOS_CONFIG_LIBS=${GEOS_CONFIG_LIBS}")
133
139
#MESSAGE("DBG GEOS_LIB_NAME_WITH_PREFIX=${GEOS_LIB_NAME_WITH_PREFIX}")
134
140
SET (GEOS_LIB_NAME_WITH_PREFIX -lgeos_c CACHE STRING INTERNAL )
141
+ SET (GEOS_CPP_LIB_NAME_WITH_PREFIX -lgeos CACHE STRING INTERNAL )
135
142
136
143
## remove prefix -l because we need the pure name
137
144
138
145
IF (GEOS_LIB_NAME_WITH_PREFIX )
139
146
STRING (REGEX REPLACE "[-][l]" "" GEOS_LIB_NAME ${GEOS_LIB_NAME_WITH_PREFIX} )
140
147
ENDIF (GEOS_LIB_NAME_WITH_PREFIX )
148
+ IF (GEOS_CPP_LIB_NAME_WITH_PREFIX )
149
+ STRING (REGEX REPLACE "[-][l]" "" GEOS_CPP_LIB_NAME ${GEOS_CPP_LIB_NAME_WITH_PREFIX} )
150
+ ENDIF (GEOS_CPP_LIB_NAME_WITH_PREFIX )
141
151
#MESSAGE("DBG GEOS_LIB_NAME=${GEOS_LIB_NAME}")
142
152
143
153
IF (APPLE )
@@ -146,9 +156,11 @@ ELSE(WIN32)
146
156
# while still preserving user setting if given
147
157
# ***FIXME*** need to improve framework check so below not needed
148
158
SET (GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES} /lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE )
159
+ SET (GEOS_CPP_LIBRARY ${GEOS_LINK_DIRECTORIES} /lib${GEOS_CPP_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE )
149
160
ENDIF (NOT GEOS_LIBRARY )
150
161
ELSE (APPLE )
151
162
SET (GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES} /lib${GEOS_LIB_NAME}.so CACHE STRING INTERNAL )
163
+ SET (GEOS_CPP_LIBRARY ${GEOS_LINK_DIRECTORIES} /lib${GEOS_CPP_LIB_NAME}.so CACHE STRING INTERNAL )
152
164
ENDIF (APPLE )
153
165
#MESSAGE("DBG GEOS_LIBRARY=${GEOS_LIBRARY}")
154
166
0 commit comments