Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
finish #4111:
- apply missing bits - update internal spatialindex copy to 1.6.1 - update debian packaging to use external library
- Loading branch information
Showing
55 changed files
with
4,794 additions
and
5,259 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
# Find Spatialindex | ||
# ~~~~~~~~ | ||
# Redistribution and use is allowed according to the terms of the BSD license. | ||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file. | ||
# | ||
# Once run this will define: | ||
# | ||
# SPATIALINDEX_FOUND = system has Spatialindex lib | ||
# SPATIALINDEX_LIBRARY = full path to the Spatialindex library | ||
# SPATIALINDEX_INCLUDE_DIR = where to find headers | ||
# | ||
|
||
|
||
FIND_PATH(SPATIALINDEX_INCLUDE_DIR NAMES SpatialIndex.h PATHS | ||
/usr/include | ||
/usr/local/include | ||
"$ENV{LIB_DIR}/include" | ||
"$ENV{INCLUDE}" | ||
PATH_SUFFIXES spatialindex | ||
) | ||
|
||
FIND_LIBRARY(SPATIALINDEX_LIBRARY NAMES spatialindex PATHS | ||
/usr/lib | ||
/usr/local/lib | ||
"$ENV{LIB_DIR}/lib" | ||
"$ENV{LIB}/lib" | ||
) | ||
|
||
IF (SPATIALINDEX_INCLUDE_DIR AND SPATIALINDEX_LIBRARY) | ||
SET(SPATIALINDEX_FOUND TRUE) | ||
ENDIF (SPATIALINDEX_INCLUDE_DIR AND SPATIALINDEX_LIBRARY) | ||
|
||
IF (SPATIALINDEX_FOUND) | ||
IF (NOT SPATIALINDEX_FIND_QUIETLY) | ||
MESSAGE(STATUS "Found Spatialindex: ${SPATIALINDEX_LIBRARY}") | ||
ENDIF (NOT SPATIALINDEX_FIND_QUIETLY) | ||
ELSE (SPATIALINDEX_FOUND) | ||
IF (SPATIALINDEX_FIND_REQUIRED) | ||
MESSAGE(FATAL_ERROR "Could not find Spatialindex") | ||
ENDIF (SPATIALINDEX_FIND_REQUIRED) | ||
ENDIF (SPATIALINDEX_FOUND) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,10 @@ | ||
|
||
Spatial indexing is based on code by Marios Hadjieleftheriou, who has | ||
developed spatial index library and published it under GNU GPL. | ||
|
||
This code is based on version 1.0 of the library which can be found here: | ||
http://u-foria.org/marioh/spatialindex/index.html | ||
|
||
Spatial index library has Tools library as a dependency. Here we use it | ||
in version 0.51b, it's available online (also under GNU GPL): | ||
http://u-foria.org/marioh/tools/index.html | ||
This code is based on version 1.6.1 of the library which can be found here: | ||
http://download.osgeo.org/libspatialindex/spatialindex-src-1.6.1.tar.gz | ||
|
||
There are only few differences from the original libraries, namely: | ||
- removed MVR-tree, TPR-tree and their variants of Point and Region | ||
- removed SHA1 hash | ||
- MVR-tree, TPR-tree and their variants of Point and Region were removed | ||
- some warnings fixed (i<0 for unsigned, unreferenced arguments) | ||
- reindentation |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.