Skip to content

Commit 8cec2c9

Browse files
mhugentmhugent
committedSep 25, 2015
Merge pull request #2302 from manisandro/geometry_plugins
Geometry Checker and Geometry Snapper plugins
·
ltr-3_40archive/master_2
2 parents e655c26 + 2ea4ee9 commit 8cec2c9

File tree

144 files changed

+10474
-329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+10474
-329
lines changed
 

‎ci/travis/linux/before_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sudo apt-get update -qq
88
sudo apt-get install --force-yes --no-install-recommends --no-install-suggests \
99
bison cmake cmake-data doxygen flex git graphviz \
1010
grass-dev grass7-dev libexpat1-dev libfcgi-dev \
11-
libgdal1-dev libgeos-dev libgsl0-dev libpq-dev \
11+
libgdal1-dev libgeos-dev libgeos++-dev libgsl0-dev libpq-dev \
1212
libproj-dev libqscintilla2-dev libqt4-dev \
1313
libqt4-opengl-dev libqt4-sql-sqlite libqtwebkit-dev \
1414
libqwt-dev libspatialindex-dev libspatialite-dev \

‎cmake/FindGEOS.cmake

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,16 @@ IF(WIN32)
2323
IF (MINGW)
2424
FIND_PATH(GEOS_INCLUDE_DIR geos_c.h /usr/local/include /usr/include c:/msys/local/include)
2525
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)
2627
ENDIF (MINGW)
2728

2829
IF (MSVC)
2930
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
3136
"$ENV{LIB_DIR}/lib"
3237
$ENV{LIB}
3338
)
@@ -67,6 +72,7 @@ ELSE(WIN32)
6772

6873
IF(CYGWIN)
6974
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)
7076
ENDIF(CYGWIN)
7177

7278
IF (NOT GEOS_INCLUDE_DIR OR NOT GEOS_LIBRARY OR NOT GEOS_CONFIG)
@@ -132,12 +138,16 @@ ELSE(WIN32)
132138
#MESSAGE("DBG GEOS_CONFIG_LIBS=${GEOS_CONFIG_LIBS}")
133139
#MESSAGE("DBG GEOS_LIB_NAME_WITH_PREFIX=${GEOS_LIB_NAME_WITH_PREFIX}")
134140
SET(GEOS_LIB_NAME_WITH_PREFIX -lgeos_c CACHE STRING INTERNAL)
141+
SET(GEOS_CPP_LIB_NAME_WITH_PREFIX -lgeos CACHE STRING INTERNAL)
135142

136143
## remove prefix -l because we need the pure name
137144

138145
IF (GEOS_LIB_NAME_WITH_PREFIX)
139146
STRING(REGEX REPLACE "[-][l]" "" GEOS_LIB_NAME ${GEOS_LIB_NAME_WITH_PREFIX} )
140147
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)
141151
#MESSAGE("DBG GEOS_LIB_NAME=${GEOS_LIB_NAME}")
142152

143153
IF (APPLE)
@@ -146,9 +156,11 @@ ELSE(WIN32)
146156
# while still preserving user setting if given
147157
# ***FIXME*** need to improve framework check so below not needed
148158
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)
149160
ENDIF (NOT GEOS_LIBRARY)
150161
ELSE (APPLE)
151162
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)
152164
ENDIF (APPLE)
153165
#MESSAGE("DBG GEOS_LIBRARY=${GEOS_LIBRARY}")
154166

0 commit comments

Comments
 (0)
Failed to load comments.