Skip to content
Permalink
Browse files
osgeo4w update: use external libspatialindex
  • Loading branch information
jef-n committed Oct 8, 2011
1 parent cf5e790 commit acb921b188ab6dbd70c586be22f6921cd1cd5507
Showing with 5 additions and 1 deletion.
  1. +3 −1 cmake/FindSpatialindex.cmake
  2. +1 −0 ms-windows/osgeo4w/package-nightly.cmd
  3. +1 −0 ms-windows/osgeo4w/package.cmd
@@ -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)
@@ -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 ^
@@ -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 ^

0 comments on commit acb921b

Please sign in to comment.