diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-27 19:44:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-27 19:44:26 -0700 |
| commit | 34bc15130b730fd1647710d54107ec6c161e12d2 (patch) | |
| tree | d19af6911f1fc19b4d1ca9d9b63aece07c8f4666 | |
| parent | 58b0560f89669774a1e1cc3ee776f28dab7a4640 (diff) | |
| parent | 0701a700276c6c8a2cc88d47084c2a69d25eaf91 (diff) | |
| download | vcpkg-34bc15130b730fd1647710d54107ec6c161e12d2.tar.gz vcpkg-34bc15130b730fd1647710d54107ec6c161e12d2.zip | |
Merge pull request #971 from jumpinjackie/gdal-geos-support
Light up GEOS support in GDAL
| -rw-r--r-- | ports/gdal/CONTROL | 4 | ||||
| -rw-r--r-- | ports/gdal/portfile.cmake | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL index 16b1caa7e..c6685e28d 100644 --- a/ports/gdal/CONTROL +++ b/ports/gdal/CONTROL @@ -1,4 +1,4 @@ Source: gdal -Version: 1.11.3-1 +Version: 1.11.3-2 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data. -Build-Depends: proj, libpng +Build-Depends: proj, libpng, geos diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 9bf301664..6d098cb2f 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -42,10 +42,17 @@ file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PNG_INCLUDE_DIR) file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpng16.lib" PNG_LIBRARY_REL) file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.lib" PNG_LIBRARY_DBG) +# Setup geos libraries + include path +file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" GEOS_INCLUDE_DIR) +file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib" GEOS_LIBRARY_REL) +file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geos_c.lib" GEOS_LIBRARY_DBG) + set(NMAKE_OPTIONS GDAL_HOME=${NATIVE_PACKAGES_DIR} DATADIR=${NATIVE_DATA_DIR} HTMLDIR=${NATIVE_HTML_DIR} + GEOS_DIR=${GEOS_INCLUDE_DIR} + "GEOS_CFLAGS=-I${GEOS_INCLUDE_DIR} -DHAVE_GEOS" PROJ_INCLUDE=-I${PROJ_INCLUDE_DIR} PNG_EXTERNAL_LIB=1 PNGDIR=${PNG_INCLUDE_DIR} @@ -74,13 +81,15 @@ set(NMAKE_OPTIONS_REL CXX_CRT_FLAGS=${LINKAGE_FLAGS} PROJ_LIBRARY=${PROJ_LIBRARY_REL} PNG_LIB=${PNG_LIBRARY_REL} + GEOS_LIB=${GEOS_LIBRARY_REL} ) set(NMAKE_OPTIONS_DBG "${NMAKE_OPTIONS}" CXX_CRT_FLAGS="${LINKAGE_FLAGS}d" PROJ_LIBRARY=${PROJ_LIBRARY_DBG} - PNG_LIB=${PNG_LIBRARY_DBG} + PNG_LIB=${PNG_LIBRARY_DBG} + GEOS_LIB=${GEOS_LIBRARY_DBG} DEBUG=1 ) ################ |