diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-05-29 01:58:00 +0200 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-05-28 16:58:00 -0700 |
| commit | a9303736fdda58cf5ff3ccc969be917580493c91 (patch) | |
| tree | fab5304f58fa8017e982423ee59fbfd386a1dc62 /ports/libspatialite | |
| parent | 3d4b4c02ede7b343f4cd9cdfebbd3124ad834045 (diff) | |
| download | vcpkg-a9303736fdda58cf5ff3ccc969be917580493c91.tar.gz vcpkg-a9303736fdda58cf5ff3ccc969be917580493c91.zip | |
[LibLZMA] automatic configuration (#6000)
* [LibLZMA] add a config-generated by CMake
* bump control files of LibLZMA and dependent ports
* [tiff] use proper liblzma target
[OpenCV] add an explicit dependency on LibLZMA for static linking
* [liblzma] fix header install path
* [LibLZMA] avoid using targets in old symbols
* fixes for windows-static and trying to see if CI is happier with a share/lib folder written in lowercase
* [LibLZMA] use only modern CMake language, remove patch in favour of target public definition
* [lzma] put symbols in cmake cache
* [libxmlpp] remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS regression
* [lzma] fix header install path
* [liblzma] install wrapper to force config mode
* [liblzma] remove function check inside cmake config since we know it will pass
* [liblzma] wrapper fix
* [tiff,geotiff] general cleanup and patch fixes
* [libgeotiff] remove debug tools
* [tesseract] modernize
* [tiff] fix also tiff_library symbol
* [pdal,libgeotiff] better library integration
* [tiff] restore using unix i/o on UWP, since it was working... for sure win32 one cannot work
* [tiff] enable lzma also on uwp, since it works and is requested by many dependencies
* [selene] enable build on arm/arm64-windows, which was surely broken before
* [lzma] uniform naming with cmake 3.14
* [podofo] fix regression, it requires openssl which was disabled in dependencies
* [many ports] remove unnecessary mods
* [boost-iostream] chmod
* [openssl] fix regression due to missing architecture
* [podofo] fix regression on uwp due to missing include
* [libpq] explicitly fail on UWP, it should avoid being marked as regression
* [shiva] fix regression on linux
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 \ |