Skip to content

Commit c02421a

Browse files
jef-njef-n
committedOct 8, 2011
finish #4111:
- apply missing bits - update internal spatialindex copy to 1.6.1 - update debian packaging to use external library
·
ltr-3_40Before-merge-new_vector_api
1 parent 356c87b commit c02421a

Some content is hidden

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

55 files changed

+4794
-5259
lines changed
 

‎cmake/FindSpatialindex.cmake

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Find Spatialindex
2+
# ~~~~~~~~
3+
# Redistribution and use is allowed according to the terms of the BSD license.
4+
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
5+
#
6+
# Once run this will define:
7+
#
8+
# SPATIALINDEX_FOUND = system has Spatialindex lib
9+
# SPATIALINDEX_LIBRARY = full path to the Spatialindex library
10+
# SPATIALINDEX_INCLUDE_DIR = where to find headers
11+
#
12+
13+
14+
FIND_PATH(SPATIALINDEX_INCLUDE_DIR NAMES SpatialIndex.h PATHS
15+
/usr/include
16+
/usr/local/include
17+
"$ENV{LIB_DIR}/include"
18+
"$ENV{INCLUDE}"
19+
PATH_SUFFIXES spatialindex
20+
)
21+
22+
FIND_LIBRARY(SPATIALINDEX_LIBRARY NAMES spatialindex PATHS
23+
/usr/lib
24+
/usr/local/lib
25+
"$ENV{LIB_DIR}/lib"
26+
"$ENV{LIB}/lib"
27+
)
28+
29+
IF (SPATIALINDEX_INCLUDE_DIR AND SPATIALINDEX_LIBRARY)
30+
SET(SPATIALINDEX_FOUND TRUE)
31+
ENDIF (SPATIALINDEX_INCLUDE_DIR AND SPATIALINDEX_LIBRARY)
32+
33+
IF (SPATIALINDEX_FOUND)
34+
IF (NOT SPATIALINDEX_FIND_QUIETLY)
35+
MESSAGE(STATUS "Found Spatialindex: ${SPATIALINDEX_LIBRARY}")
36+
ENDIF (NOT SPATIALINDEX_FIND_QUIETLY)
37+
ELSE (SPATIALINDEX_FOUND)
38+
IF (SPATIALINDEX_FIND_REQUIRED)
39+
MESSAGE(FATAL_ERROR "Could not find Spatialindex")
40+
ENDIF (SPATIALINDEX_FIND_REQUIRED)
41+
ENDIF (SPATIALINDEX_FOUND)

‎debian/changelog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ qgis (1.8.0) UNRELEASED; urgency=low
99
* update watch
1010
* drop abi postfix from sqlanywhere plugin
1111
* include network analysis library
12+
* build unstable and squeeze package with libspatialindex.
1213

13-
-- Jürgen E. Fischer <jef@norbit.de> Thu, 29 Sep 2011 21:44:50 +0000
14+
-- Jürgen E. Fischer <jef@norbit.de> Sat, 08 Oct 2011 11:40:39 +0000
1415

1516
qgis (1.7.0) UNRELEASED; urgency=low
1617

0 commit comments

Comments
 (0)
Please sign in to comment.