mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-17 16:08:11 +08:00
Merge pull request #1001 from jumpinjackie/gdal-extra-format-support
[gdal] extra format/capabilities support
This commit is contained in:
commit
e2ee2ffd03
@ -1,4 +1,4 @@
|
|||||||
Source: gdal
|
Source: gdal
|
||||||
Version: 1.11.3-2
|
Version: 1.11.3-3
|
||||||
Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
|
Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
|
||||||
Build-Depends: proj, libpng, geos
|
Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, libmysql, openjpeg, libwebp, libxml2, liblzma
|
||||||
|
@ -47,6 +47,51 @@ 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}/lib/geos_c.lib" GEOS_LIBRARY_REL)
|
||||||
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geos_c.lib" GEOS_LIBRARY_DBG)
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geos_c.lib" GEOS_LIBRARY_DBG)
|
||||||
|
|
||||||
|
# Setup expat libraries + include path
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" EXPAT_INCLUDE_DIR)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/expat.lib" EXPAT_LIBRARY_REL)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/expat.lib" EXPAT_LIBRARY_DBG)
|
||||||
|
|
||||||
|
# Setup curl libraries + include path
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" CURL_INCLUDE_DIR)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libcurl_imp.lib" CURL_LIBRARY_REL)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl_imp.lib" CURL_LIBRARY_DBG)
|
||||||
|
|
||||||
|
# Setup sqlite3 libraries + include path
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" SQLITE_INCLUDE_DIR)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib" SQLITE_LIBRARY_REL)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib" SQLITE_LIBRARY_DBG)
|
||||||
|
|
||||||
|
# Setup MySQL libraries + include path
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include/mysql" MYSQL_INCLUDE_DIR)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib" MYSQL_LIBRARY_REL)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libmysql.lib" MYSQL_LIBRARY_DBG)
|
||||||
|
|
||||||
|
# Setup PostgreSQL libraries + include path
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PGSQL_INCLUDE_DIR)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpq.lib" PGSQL_LIBRARY_REL)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpqd.lib" PGSQL_LIBRARY_DBG)
|
||||||
|
|
||||||
|
# Setup OpenJPEG libraries + include path
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" OPENJPEG_INCLUDE_DIR)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/openjp2.lib" OPENJPEG_LIBRARY_REL)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/openjp2.lib" OPENJPEG_LIBRARY_DBG)
|
||||||
|
|
||||||
|
# Setup WebP libraries + include path
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" WEBP_INCLUDE_DIR)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/webp.lib" WEBP_LIBRARY_REL)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/webpd.lib" WEBP_LIBRARY_DBG)
|
||||||
|
|
||||||
|
# Setup libxml2 libraries + include path
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" XML2_INCLUDE_DIR)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib" XML2_LIBRARY_REL)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib" XML2_LIBRARY_DBG)
|
||||||
|
|
||||||
|
# Setup liblzma libraries + include path
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" LZMA_INCLUDE_DIR)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/lzma.lib" LZMA_LIBRARY_REL)
|
||||||
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/lzma.lib" LZMA_LIBRARY_DBG)
|
||||||
|
|
||||||
set(NMAKE_OPTIONS
|
set(NMAKE_OPTIONS
|
||||||
GDAL_HOME=${NATIVE_PACKAGES_DIR}
|
GDAL_HOME=${NATIVE_PACKAGES_DIR}
|
||||||
DATADIR=${NATIVE_DATA_DIR}
|
DATADIR=${NATIVE_DATA_DIR}
|
||||||
@ -54,6 +99,18 @@ set(NMAKE_OPTIONS
|
|||||||
GEOS_DIR=${GEOS_INCLUDE_DIR}
|
GEOS_DIR=${GEOS_INCLUDE_DIR}
|
||||||
"GEOS_CFLAGS=-I${GEOS_INCLUDE_DIR} -DHAVE_GEOS"
|
"GEOS_CFLAGS=-I${GEOS_INCLUDE_DIR} -DHAVE_GEOS"
|
||||||
PROJ_INCLUDE=-I${PROJ_INCLUDE_DIR}
|
PROJ_INCLUDE=-I${PROJ_INCLUDE_DIR}
|
||||||
|
EXPAT_DIR=${EXPAT_INCLUDE_DIR}
|
||||||
|
EXPAT_INCLUDE=-I${EXPAT_INCLUDE_DIR}
|
||||||
|
CURL_INC=-I${CURL_INCLUDE_DIR}
|
||||||
|
SQLITE_INC=-I${SQLITE_INCLUDE_DIR}
|
||||||
|
MYSQL_INC_DIR=${MYSQL_INCLUDE_DIR}
|
||||||
|
PG_INC_DIR=${PGSQL_INCLUDE_DIR}
|
||||||
|
OPENJPEG_ENABLED=YES
|
||||||
|
OPENJPEG_CFLAGS=-I${OPENJPEG_INCLUDE_DIR}
|
||||||
|
OPENJPEG_VERSION=20100
|
||||||
|
WEBP_ENABLED=YES
|
||||||
|
WEBP_CFLAGS=-I${WEBP_INCLUDE_DIR}
|
||||||
|
LIBXML2_INC=-I${XML2_INCLUDE_DIR}
|
||||||
PNG_EXTERNAL_LIB=1
|
PNG_EXTERNAL_LIB=1
|
||||||
PNGDIR=${PNG_INCLUDE_DIR}
|
PNGDIR=${PNG_INCLUDE_DIR}
|
||||||
MSVC_VER=1900
|
MSVC_VER=1900
|
||||||
@ -82,6 +139,14 @@ set(NMAKE_OPTIONS_REL
|
|||||||
PROJ_LIBRARY=${PROJ_LIBRARY_REL}
|
PROJ_LIBRARY=${PROJ_LIBRARY_REL}
|
||||||
PNG_LIB=${PNG_LIBRARY_REL}
|
PNG_LIB=${PNG_LIBRARY_REL}
|
||||||
GEOS_LIB=${GEOS_LIBRARY_REL}
|
GEOS_LIB=${GEOS_LIBRARY_REL}
|
||||||
|
EXPAT_LIB=${EXPAT_LIBRARY_REL}
|
||||||
|
"CURL_LIB=${CURL_LIBRARY_REL} wsock32.lib wldap32.lib winmm.lib"
|
||||||
|
SQLITE_LIB=${SQLITE_LIBRARY_REL}
|
||||||
|
MYSQL_LIB=${MYSQL_LIBRARY_REL}
|
||||||
|
PG_LIB=${PGSQL_LIBRARY_REL}
|
||||||
|
OPENJPEG_LIB=${OPENJPEG_LIBRARY_REL}
|
||||||
|
WEBP_LIBS=${WEBP_LIBRARY_REL}
|
||||||
|
LIBXML2_LIB=${XML2_LIBRARY_REL}
|
||||||
)
|
)
|
||||||
|
|
||||||
set(NMAKE_OPTIONS_DBG
|
set(NMAKE_OPTIONS_DBG
|
||||||
@ -90,6 +155,14 @@ set(NMAKE_OPTIONS_DBG
|
|||||||
PROJ_LIBRARY=${PROJ_LIBRARY_DBG}
|
PROJ_LIBRARY=${PROJ_LIBRARY_DBG}
|
||||||
PNG_LIB=${PNG_LIBRARY_DBG}
|
PNG_LIB=${PNG_LIBRARY_DBG}
|
||||||
GEOS_LIB=${GEOS_LIBRARY_DBG}
|
GEOS_LIB=${GEOS_LIBRARY_DBG}
|
||||||
|
EXPAT_LIB=${EXPAT_LIBRARY_DBG}
|
||||||
|
"CURL_LIB=${CURL_LIBRARY_DBG} wsock32.lib wldap32.lib winmm.lib"
|
||||||
|
SQLITE_LIB=${SQLITE_LIBRARY_DBG}
|
||||||
|
MYSQL_LIB=${MYSQL_LIBRARY_DBG}
|
||||||
|
PG_LIB=${PGSQL_LIBRARY_DBG}
|
||||||
|
OPENJPEG_LIB=${OPENJPEG_LIBRARY_DBG}
|
||||||
|
WEBP_LIBS=${WEBP_LIBRARY_DBG}
|
||||||
|
LIBXML2_LIB=${XML2_LIBRARY_DBG}
|
||||||
DEBUG=1
|
DEBUG=1
|
||||||
)
|
)
|
||||||
################
|
################
|
||||||
|
Loading…
x
Reference in New Issue
Block a user