mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-18 10:03:02 +08:00
Light up GEOS support in GDAL
This commit is contained in:
parent
1cbb3e8714
commit
0701a70027
@ -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
|
||||
|
@ -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
|
||||
)
|
||||
################
|
||||
|
Loading…
Reference in New Issue
Block a user