diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-10-18 08:15:52 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2019-10-17 17:15:52 -0700 |
| commit | 75dd38cd8a8143d9a77e81da25085ab1b7621cd6 (patch) | |
| tree | 678352df29212b686028d6b52fd4c9513140761c /ports/spatialite-tools | |
| parent | 11ef794475f3de755508a78e139c663c55e69ff7 (diff) | |
| download | vcpkg-75dd38cd8a8143d9a77e81da25085ab1b7621cd6.tar.gz vcpkg-75dd38cd8a8143d9a77e81da25085ab1b7621cd6.zip | |
[proj4] Upgrade version to 6.1.1 and remove patches. (#7917)
* [proj4]Upgrade version to 6.1.1 and remove useless patches.
* [libgeotiff]Fix build errors using proj4 6.1.1.
* [libspatialite]Fix build errors using proj4 6.1.1.
* [gdal]Fix build errors using proj4 6.1.1.
* [spatialite-tools]Fix build errors using proj4 6.1.1.
* [spatialite-tools]Fix build errors using proj4 6.1.1.
* [libgeotiff]Re-fix build errors using proj4 6.1.1.
* [vtk]Fix build errors using proj4 6.1.1.
* [proj4]Fix find sqlite binary failure.
* [proj4]Disable build tools when building proj4 in arm/uwp.
* [sqlite3/libgeotiff]Fix libdl library linkage. Re-fix use proj issue.
* add back dl libs
* [gdal]Fix dependent port proj library name.
* [proj4]Set Windows library name to "proj" and revert fix-proj-name changes.
* [liblas]Fix build errors using proj4 6.1.1.
* [liblas]Fix build errors using proj4 6.1.1.
* [liblas]Fix build errors using proj4 6.1.1.
* [proj4]Fix feature database on triplet arm/uwp.
* [gdal]Remove useless flag PROJ_STATIC.
* [proj4]Fix build error on x64-windows-static.
* [liblas]Use find_library to get proj4/sqlite3 libraries.
* [proj4]Fix sqlite dependency.
* [proj4]Fix arm/uwp dependency.
* [proj4]Fix linux build: configure error.
* [proj4]Disable export proj4 namespace.
* [liblas]Delete proj dependency.
* [libspatialite]Fix linux build.
* [libspatialite]Fix linux command.
* [libspatialite]Fix configure error.
* [proj4]fix static cmake tools path.
* [libgeotiff]Set configure options to 1/0 to avoid the "if" comparison failure in config.cmake.
[proj4]Revert changes about namespace.
[liblas]Remove FindPROJ4.cmake and FindGeoTIFF.cmake from the source.
* [vtk]Fix using latest proj4 issue.
* [proj4]Delete missing patch.
Diffstat (limited to 'ports/spatialite-tools')
| -rw-r--r-- | ports/spatialite-tools/portfile.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ports/spatialite-tools/portfile.cmake b/ports/spatialite-tools/portfile.cmake index 2f23dbb7e..7a731fd3f 100644 --- a/ports/spatialite-tools/portfile.cmake +++ b/ports/spatialite-tools/portfile.cmake @@ -20,8 +20,8 @@ find_program(NMAKE nmake) set(LDIR "\"${CURRENT_INSTALLED_DIR}\"") if(VCPKG_CRT_LINKAGE STREQUAL dynamic) - set(CL_FLAGS_DBG "/MDd /Zi") - set(CL_FLAGS_REL "/MD /Ox") + set(CL_FLAGS_DBG "/MDd /Zi /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H") + set(CL_FLAGS_REL "/MD /Ox /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H") set(GEOS_LIBS_REL "${LDIR}/lib/geos_c.lib") set(GEOS_LIBS_DBG "${LDIR}/debug/lib/geos_cd.lib") set(LIBXML2_LIBS_REL "${LDIR}/lib/libxml2.lib") @@ -31,8 +31,8 @@ if(VCPKG_CRT_LINKAGE STREQUAL dynamic) set(ICONV_LIBS_REL "${LDIR}/lib/libiconv.lib") set(ICONV_LIBS_DBG "${LDIR}/debug/lib/libiconv.lib") else() - set(CL_FLAGS_DBG "/MTd /Zi") - set(CL_FLAGS_REL "/MT /Ox") + set(CL_FLAGS_DBG "/MTd /Zi /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H") + set(CL_FLAGS_REL "/MT /Ox /DACCEPT_USE_OF_DEPRECATED_PROJ_API_H") set(GEOS_LIBS_REL "${LDIR}/lib/libgeos_c.lib ${LDIR}/lib/libgeos.lib") set(GEOS_LIBS_DBG "${LDIR}/debug/lib/libgeos_c.lib ${LDIR}/debug/lib/libgeos.lib") set(LIBXML2_LIBS_REL "${LDIR}/lib/libxml2.lib ${LDIR}/lib/lzma.lib ws2_32.lib") @@ -52,7 +52,7 @@ set(LIBS_ALL_DBG ${LDIR}/debug/lib/readosm.lib \ ${LDIR}/debug/lib/expat.lib \ ${LDIR}/debug/lib/zlibd.lib \ - ${LDIR}/debug/lib/projd.lib" + ${LDIR}/debug/lib/proj_d.lib" ) set(LIBS_ALL_REL "${ICONV_LIBS_REL} \ |