-
-
Notifications
You must be signed in to change notification settings - Fork 74
/
Copy pathros-noetic-swri-geometry-util.patch
249 lines (232 loc) · 10.3 KB
/
ros-noetic-swri-geometry-util.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bc10fc84..af9519372 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,10 +34,11 @@ catkin_package(
tf
DEPENDS
OpenCV
+ GEOS
)
include_directories(include)
-include_directories(SYSTEM
+include_directories(
${catkin_INCLUDE_DIRS}
${GEOS_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIRS}
diff --git a/FindGEOS.cmake b/FindGEOS.cmake
index 8e8b65900..f256ed1b4 100644
--- a/FindGEOS.cmake
+++ b/FindGEOS.cmake
@@ -10,25 +10,88 @@
# If it's found it sets GEOS_FOUND to TRUE
# and following variables are set:
# GEOS_INCLUDE_DIR
-# GEOS_INCLUDE_DIRS
# GEOS_LIBRARY
-# GEOS_LIBRARIES
-
-IF (NOT DEFINED GEOS_INCLUDE_DIR OR NOT DEFINED GEOS_LIBRARY OR NOT DEFINED GEOS_LIBRARIES OR NOT DEFINED GEOS_CONFIG)
- UNSET(GEOS_INCLUDE_DIR CACHE)
- UNSET(GEOS_INCLUDE_DIRS CACHE)
- UNSET(GEOS_LIBRARY CACHE)
- UNSET(GEOS_LIBRARIES CACHE)
- UNSET(GEOS_CONFIG CACHE)
-
- 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}
- /usr/local/bin/
- /usr/bin/
- )
-
- IF (DEFINED GEOS_CONFIG)
+#
+
+FUNCTION (GET_VERSION_PLIST PLISTFILE OUTVAR)
+ SET (PVERSION "")
+ IF (EXISTS ${PLISTFILE})
+ FILE (READ "${PLISTFILE}" info_plist)
+ STRING (REGEX REPLACE "\n" "" info_plist "${info_plist}")
+ STRING (REGEX MATCH "<key>CFBundleShortVersionString</key>[ \t]*<string>([0-9\\.]*)</string>" PLISTVERSION "${info_plist}")
+ STRING (REGEX REPLACE "<key>CFBundleShortVersionString</key>[ \t]*<string>([0-9\\.]*)</string>" "\\1" PVERSION "${PLISTVERSION}")
+ ENDIF (EXISTS ${PLISTFILE})
+ SET (${OUTVAR} ${PVERSION} PARENT_SCOPE)
+ENDFUNCTION (GET_VERSION_PLIST)
+
+IF(WIN32)
+
+ IF (MINGW)
+ FIND_PATH(GEOS_INCLUDE_DIR geos_c.h "$ENV{LIB_DIR}/include" /usr/local/include /usr/include c:/msys/local/include)
+ FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS "$ENV{LIB_DIR}/lib" /usr/local/lib /usr/lib c:/msys/local/lib)
+ ENDIF (MINGW)
+
+ IF (MSVC)
+ FIND_PATH(GEOS_INCLUDE_DIR geos_c.h $ENV{LIB_DIR}/include $ENV{INCLUDE})
+ FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c_i geos_c PATHS
+ "$ENV{LIB_DIR}/lib"
+ $ENV{LIB}
+ )
+ ENDIF (MSVC)
+
+ELSEIF(APPLE AND QGIS_MAC_DEPS_DIR)
+
+ FIND_PATH(GEOS_INCLUDE_DIR geos_c.h "$ENV{LIB_DIR}/include" )
+ FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS "$ENV{LIB_DIR}/lib" )
+
+ELSE(WIN32)
+
+ IF(UNIX)
+ # try to use framework on mac
+ # want clean framework path, not unix compatibility path
+ IF (APPLE)
+ IF (CMAKE_FIND_FRAMEWORK MATCHES "FIRST"
+ OR CMAKE_FRAMEWORK_PATH MATCHES "ONLY"
+ OR NOT CMAKE_FIND_FRAMEWORK)
+ SET (CMAKE_FIND_FRAMEWORK_save ${CMAKE_FIND_FRAMEWORK} CACHE STRING "" FORCE)
+ SET (CMAKE_FIND_FRAMEWORK "ONLY" CACHE STRING "" FORCE)
+ FIND_LIBRARY(GEOS_LIBRARY GEOS)
+ IF (GEOS_LIBRARY)
+ # they're all the same in a framework
+ SET (GEOS_INCLUDE_DIR ${GEOS_LIBRARY}/Headers CACHE PATH "Path to a file.")
+ # set GEOS_CONFIG to make later test happy, not used here, may not exist
+ SET (GEOS_CONFIG ${GEOS_LIBRARY}/unix/bin/geos-config CACHE FILEPATH "Path to a program.")
+ # version in info.plist
+ GET_VERSION_PLIST (${GEOS_LIBRARY}/Resources/Info.plist GEOS_VERSION)
+ IF (NOT GEOS_VERSION)
+ MESSAGE (FATAL_ERROR "Could not determine GEOS version from framework.")
+ ENDIF (NOT 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)
+ ENDIF (GEOS_LIBRARY)
+ SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
+ ENDIF ()
+ ENDIF (APPLE)
+
+ IF(CYGWIN)
+ FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS /usr/lib /usr/local/lib)
+ ENDIF(CYGWIN)
+
+ IF (NOT GEOS_INCLUDE_DIR OR NOT GEOS_LIBRARY OR NOT GEOS_CONFIG)
+ # didn't find OS X framework, and was not set by user
+ 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}
+ $ENV{LIB_DIR}/bin
+ /usr/local/bin/
+ /usr/bin/
+ )
+ #MESSAGE("DBG GEOS_CONFIG ${GEOS_CONFIG}")
+
+ IF (GEOS_CONFIG)
EXEC_PROGRAM(${GEOS_CONFIG}
ARGS --version
@@ -36,9 +99,9 @@ IF (NOT DEFINED GEOS_INCLUDE_DIR OR NOT DEFINED GEOS_LIBRARY OR NOT DEFINED GEOS
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 OR (GEOS_VERSION_MAJOR EQUAL 3 AND GEOS_VERSION_MINOR LESS 1) )
- MESSAGE (FATAL_ERROR "GEOS version is too old (${GEOS_VERSION}). Use 3.1.0 or higher.")
- ENDIF (GEOS_VERSION_MAJOR LESS 3 OR (GEOS_VERSION_MAJOR EQUAL 3 AND GEOS_VERSION_MINOR LESS 1) )
+ IF (GEOS_VERSION_MAJOR LESS 3 OR (GEOS_VERSION_MAJOR EQUAL 3 AND GEOS_VERSION_MINOR LESS 3) )
+ MESSAGE (FATAL_ERROR "GEOS version is too old (${GEOS_VERSION}). Use 3.3.0 or higher.")
+ ENDIF (GEOS_VERSION_MAJOR LESS 3 OR (GEOS_VERSION_MAJOR EQUAL 3 AND GEOS_VERSION_MINOR LESS 3) )
# set INCLUDE_DIR to prefix+include
EXEC_PROGRAM(${GEOS_CONFIG}
@@ -46,11 +109,10 @@ IF (NOT DEFINED GEOS_INCLUDE_DIR OR NOT DEFINED GEOS_LIBRARY OR NOT DEFINED GEOS
OUTPUT_VARIABLE GEOS_PREFIX)
FIND_PATH(GEOS_INCLUDE_DIR
- geos/geom.h
- PATHS
- ${GEOS_PREFIX}/include
- /usr/local/include
- /usr/include
+ geos_c.h
+ ${GEOS_PREFIX}/include
+ /usr/local/include
+ /usr/include
)
## extract link dirs for rpath
@@ -64,53 +126,73 @@ IF (NOT DEFINED GEOS_INCLUDE_DIR OR NOT DEFINED GEOS_LIBRARY OR NOT DEFINED GEOS
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(.*)" "\\1" GEOS_LINK_DIRECTORIES ${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}" )
+ #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(.*)" "\\2" GEOS_LIBRARY ${GEOS_LIB_NAME_WITH_PREFIX} )
+ STRING(REGEX REPLACE "[-][l]" "" GEOS_LIB_NAME ${GEOS_LIB_NAME_WITH_PREFIX} )
ENDIF (GEOS_LIB_NAME_WITH_PREFIX)
-
- ELSE(DEFINED GEOS_CONFIG)
+ #MESSAGE("DBG GEOS_LIB_NAME=${GEOS_LIB_NAME}")
+
+ IF (APPLE)
+ IF (NOT GEOS_LIBRARY)
+ # work around empty GEOS_LIBRARY left by framework check
+ # while still preserving user setting if given
+ # ***FIXME*** need to improve framework check so below not needed
+ SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
+ ENDIF (NOT GEOS_LIBRARY)
+ ELSE (APPLE)
+ FIND_LIBRARY(GEOS_LIBRARY NAMES ${GEOS_LIB_NAME} PATHS ${GEOS_LIB_DIRECTORIES}/lib)
+ 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(DEFINED GEOS_CONFIG)
-ENDIF(NOT DEFINED GEOS_INCLUDE_DIR OR NOT DEFINED GEOS_LIBRARY OR NOT DEFINED GEOS_LIBRARIES OR NOT DEFINED GEOS_CONFIG)
+ ENDIF(GEOS_CONFIG)
+ ENDIF(NOT GEOS_INCLUDE_DIR OR NOT GEOS_LIBRARY OR NOT GEOS_CONFIG)
+ ENDIF(UNIX)
+ENDIF(WIN32)
-IF(DEFINED GEOS_INCLUDE_DIR AND NOT DEFINED GEOS_VERSION)
+IF(GEOS_INCLUDE_DIR AND NOT GEOS_VERSION)
FILE(READ ${GEOS_INCLUDE_DIR}/geos_c.h VERSIONFILE)
- STRING(REGEX MATCH "#define GEOS_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+(dev)?\"" GEOS_VERSION ${VERSIONFILE})
+ STRING(REGEX MATCH "#define GEOS_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" GEOS_VERSION ${VERSIONFILE})
STRING(REGEX MATCH "[0-9]+\\.[0-9]\\.[0-9]+" GEOS_VERSION ${GEOS_VERSION})
-ENDIF(DEFINED GEOS_INCLUDE_DIR AND NOT DEFINED GEOS_VERSION)
+ENDIF(GEOS_INCLUDE_DIR AND NOT GEOS_VERSION)
IF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
SET(GEOS_FOUND TRUE)
- SET(GEOS_LIBRARIES ${GEOS_LIBRARY})
- SET(GEOS_INCLUDE_DIRS ${GEOS_INCLUDE_DIR})
ENDIF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
IF (GEOS_FOUND)
IF (NOT GEOS_FIND_QUIETLY)
- MESSAGE(STATUS "Found GEOS: ${GEOS_LIBRARY} (version: ${GEOS_VERSION}, includes: ${GEOS_INCLUDE_DIRS})")
+ SET(GEOS_LIBRARIES ${GEOS_LIBRARY})
+ MESSAGE(STATUS "Found GEOS: ${GEOS_LIBRARIES} (${GEOS_VERSION})")
ENDIF (NOT GEOS_FIND_QUIETLY)
ELSE (GEOS_FOUND)
MESSAGE(GEOS_INCLUDE_DIR=${GEOS_INCLUDE_DIR})
MESSAGE(GEOS_LIBRARY=${GEOS_LIBRARY})
- MESSAGE(FATAL_ERROR "Could not find GEOS. Perhaps try:\n$ sudo apt-get install libgeos++-dev\n")
+ MESSAGE(FATAL_ERROR "Could not find GEOS")
ENDIF (GEOS_FOUND)
+