diff options
| author | myd7349 <myd7349@gmail.com> | 2019-06-14 07:55:33 +0800 |
|---|---|---|
| committer | myd7349 <myd7349@gmail.com> | 2019-06-14 07:55:33 +0800 |
| commit | 1e9b8dd1b420aac64cbdd8bb905c02fa3c651b17 (patch) | |
| tree | 284efa9cf01657928d184e194a39e7cdee682e04 /ports/libspatialite | |
| parent | 7cd35529736837e2e74dad231717bda76327ac79 (diff) | |
| parent | b03f62e0ebc1b5515bc8a1f41f3bfe9eca6589d4 (diff) | |
| download | vcpkg-1e9b8dd1b420aac64cbdd8bb905c02fa3c651b17.tar.gz vcpkg-1e9b8dd1b420aac64cbdd8bb905c02fa3c651b17.zip | |
Merge branch 'master' into rdkafka-init
Diffstat (limited to 'ports/libspatialite')
| -rw-r--r-- | ports/libspatialite/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libspatialite/portfile.cmake | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ports/libspatialite/CONTROL b/ports/libspatialite/CONTROL index bb19a0605..c535d33e1 100644 --- a/ports/libspatialite/CONTROL +++ b/ports/libspatialite/CONTROL @@ -1,5 +1,5 @@ Source: libspatialite -Version: 4.3.0a-2 +Version: 4.3.0a-3 Description: SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities. Build-Depends: libxml2, sqlite3, geos, proj4, zlib, freexl, libiconv diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index 59a1499f4..b73733ff2 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -33,10 +33,10 @@ else() set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libgeos_c.lib ${CURRENT_INSTALLED_DIR}/lib/libgeos.lib") set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libgeos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libgeosd.lib") set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/lib/lzma.lib ws2_32.lib") - set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzma.lib ws2_32.lib") + set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib ws2_32.lib") endif() -set(LIBS_ALL_DBG +set(LIBS_ALL_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libiconv.lib \ ${CURRENT_INSTALLED_DIR}/debug/lib/libcharset.lib \ ${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib \ @@ -46,7 +46,7 @@ set(LIBS_ALL_DBG ${GEOS_LIBS_DBG} \ ${CURRENT_INSTALLED_DIR}/debug/lib/projd.lib" ) -set(LIBS_ALL_REL +set(LIBS_ALL_REL "${CURRENT_INSTALLED_DIR}/lib/libiconv.lib \ ${CURRENT_INSTALLED_DIR}/lib/libcharset.lib \ ${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib \ |