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/liblas/fix-BuildError.patch | |
| 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/liblas/fix-BuildError.patch')
| -rw-r--r-- | ports/liblas/fix-BuildError.patch | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/ports/liblas/fix-BuildError.patch b/ports/liblas/fix-BuildError.patch index 277e81ef7..4f9d768dc 100644 --- a/ports/liblas/fix-BuildError.patch +++ b/ports/liblas/fix-BuildError.patch @@ -31,17 +31,3 @@ index c7f583d..ca9e602 100644 # Now create the liblas-config files using the .in templates configure_file (liblas-config.cmake.in -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e35de06..f7c25d2 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -226,7 +226,8 @@ target_link_libraries(${LIBLAS_LIB_NAME} - ${GEOTIFF_LIBRARY} - ${GDAL_LIBRARY} - ${LASZIP_LIBRARY} -- ${Boost_LIBRARIES}) -+ ${Boost_LIBRARIES} -+ proj) - - target_link_libraries(${LIBLAS_C_LIB_NAME} - ${LIBLAS_LIB_NAME} ) |