diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-11-22 09:47:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 09:47:40 -0800 |
| commit | 45f4b820e5743b89bca3508ba2028cdd5d8bbd17 (patch) | |
| tree | f874a8c4a7392309bdbb86447288597ec0a4a281 /ports/spatialite-tools | |
| parent | 62d67d3bf8eeff1afa8009041fd08b8822676b7b (diff) | |
| parent | 8831e8f25f1ff6546ee4a5291b91d599421637b3 (diff) | |
| download | vcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.tar.gz vcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.zip | |
Merge branch 'master' into vcpkg_nuget
Diffstat (limited to 'ports/spatialite-tools')
| -rw-r--r-- | ports/spatialite-tools/CONTROL | 2 | ||||
| -rw-r--r-- | ports/spatialite-tools/portfile.cmake | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/ports/spatialite-tools/CONTROL b/ports/spatialite-tools/CONTROL index 3ba32121c..73a698dee 100644 --- a/ports/spatialite-tools/CONTROL +++ b/ports/spatialite-tools/CONTROL @@ -1,5 +1,5 @@ Source: spatialite-tools -Version: 4.3.0-1 +Version: 4.3.0-2 Homepage: https://www.gaia-gis.it/fossil/spatialite-tools/index Description: Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries) Build-Depends: sqlite3, libspatialite, geos, readosm, proj4, zlib, libiconv, expat diff --git a/ports/spatialite-tools/portfile.cmake b/ports/spatialite-tools/portfile.cmake index 25de070ee..7a731fd3f 100644 --- a/ports/spatialite-tools/portfile.cmake +++ b/ports/spatialite-tools/portfile.cmake @@ -2,26 +2,26 @@ include(vcpkg_common_functions) option(BUILD_DEBUG_TOOLS "Build debug version of tools" OFF) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/spatialite-tools-4.3.0) vcpkg_download_distfile(ARCHIVE URLS "http://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-4.3.0.tar.gz" FILENAME "spatialite-tools-4.3.0.tar.gz" SHA512 e1de27c1c65ff2ff0b08583113517bea74edf33fff59ad6e9c77492ea3ae87d9c0f17d7670ee6602b32eea73ad3678bb5410ef2c6fac6e213bf2e341a907db88 ) -vcpkg_extract_source_archive(${ARCHIVE}) -find_program(NMAKE nmake) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-makefiles.patch +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + fix-makefiles.patch ) +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} \ |