osgeo4w update: use external libspatialindex

qgis · Oct 8, 2011 · acb921b · acb921b
1 parent cf5e790
commit acb921b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/cmake/FindSpatialindex.cmake b/cmake/FindSpatialindex.cmake
@@ -16,14 +16,16 @@ FIND_PATH(SPATIALINDEX_INCLUDE_DIR NAMES SpatialIndex.h PATHS
   /usr/local/include
   "$ENV{LIB_DIR}/include"
   "$ENV{INCLUDE}"
+  "$ENV{OSGEO4W_ROOT}/include"
   PATH_SUFFIXES spatialindex
   )
 
-FIND_LIBRARY(SPATIALINDEX_LIBRARY NAMES spatialindex PATHS
+FIND_LIBRARY(SPATIALINDEX_LIBRARY NAMES spatialindex_i spatialindex PATHS
   /usr/lib
   /usr/local/lib
   "$ENV{LIB_DIR}/lib"
   "$ENV{LIB}/lib"
+  "$ENV{OSGEO4W_ROOT}/lib"
   )
 
 IF (SPATIALINDEX_INCLUDE_DIR AND SPATIALINDEX_LIBRARY)

diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -93,6 +93,7 @@ cmake -G "Visual Studio 9 2008" ^
 	-D WITH_ASTYLE=TRUE ^
 	-D WITH_GLOBE=TRUE ^
 	-D WITH_INTERNAL_SPATIALITE=TRUE ^
+	-D WITH_INTERNAL_SPATIALINDEX=FALSE ^
 	-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
 	-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
 	-D GEOS_LIBRARY=%OSGEO4W_ROOT%/lib/geos_c_i.lib ^

diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -91,6 +91,7 @@ cmake -G "Visual Studio 9 2008" ^
 	-D WITH_MAPSERVER=TRUE ^
 	-D WITH_GLOBE=TRUE ^
 	-D WITH_INTERNAL_SPATIALITE=TRUE ^
+	-D WITH_INTERNAL_SPATIALINDEX=FALSE ^
 	-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
 	-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
 	-D GEOS_LIBRARY=%OSGEO4W_ROOT%/lib/geos_c_i.lib ^