diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-11-20 10:29:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 10:29:25 -0800 |
| commit | fdfe770571b3711bbc1c708e0ea95766b0bc8e51 (patch) | |
| tree | 4b70a928c78090278196f36694803433d8e664c5 /ports/pdal/fix-dependency.patch | |
| parent | 46068e8a37b41a7a0ba4f485a90d88d3a1071f33 (diff) | |
| download | vcpkg-fdfe770571b3711bbc1c708e0ea95766b0bc8e51.tar.gz vcpkg-fdfe770571b3711bbc1c708e0ea95766b0bc8e51.zip | |
[gdal] Update to 3.1.3 (#13449)
* [vcpkg_*_nmake] Add option INSTALL_COMMAND
* [gdal] Update to 3.1.3 and switch to vcpkg_*_nmake on Windows
* [vcpkg_build_make] Add option MAKEFILE
* fix install on windows, fix linux build
* fix options position
* [gdal] Fix linux build
* [gdal] Fix expat library name
* [gdal] Fix geos library name
* [gdal] Fix cmake wrapper
* [pdal] Fix dependency geos
* [pdal] Fix PDALConfig.cmake
* [gdal] Fix dependency cfitsio on *inx
* disable cfitsio temporary
* [gdal] Correct cmake wrapper and usage
* [gdal] Fix tools on windows-static
* Revert a9ac823007975485aacc7e1f3eb4053e295376e1
* Apply suggestions
* [vcpkg_build_nmake] Fix install command
* [vcpkg_build_nmake] Fix install command
* regenerate docs
* [gdal] Update dependency iconv and charset library names
* [gdal] add json-c as a dependency on non-windows
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'ports/pdal/fix-dependency.patch')
| -rw-r--r-- | ports/pdal/fix-dependency.patch | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch index f7351c950..352eb1d43 100644 --- a/ports/pdal/fix-dependency.patch +++ b/ports/pdal/fix-dependency.patch @@ -1,20 +1,19 @@ diff --git a/cmake/geos.cmake b/cmake/geos.cmake -index 90b79d9..4e144a6 100644 +index 90b79d9..5942ee5 100644 --- a/cmake/geos.cmake +++ b/cmake/geos.cmake -@@ -1,7 +1,11 @@ +@@ -1,8 +1,5 @@ # # GEOS (required) # -find_package(GEOS QUIET 3.3) -+include(SelectLibraryConfigurations) -+find_library(GEOS_LIBRARY_RELEASE NAMES geos_c libgeos_c) -+find_library(GEOS_LIBRARY_DEBUG NAMES geos_cd libgeos_cd) -+select_library_configurations(GEOS) -+find_path(GEOS_INCLUDE_DIR geos_c.h) - set_package_properties(GEOS PROPERTIES TYPE REQUIRED - PURPOSE "Provides general purpose geometry support") - +-set_package_properties(GEOS PROPERTIES TYPE REQUIRED +- PURPOSE "Provides general purpose geometry support") +- +-include_directories("${GEOS_INCLUDE_DIR}") ++find_package(geos CONFIG REQUIRED) ++set(GEOS_LIBRARY GEOS::geos GEOS::geos_c GEOS::geos_cxx_flags) +\ No newline at end of file diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake index 8178418..31b54d6 100644 --- a/cmake/modules/FindPostgreSQL.cmake @@ -46,14 +45,18 @@ index 42cca1e..43b0ced 100644 add_subdirectory(vendor/kazhdan) if (NOT PDAL_HAVE_JSONCPP) diff --git a/PDALConfig.cmake.in b/PDALConfig.cmake.in -index ea695cf..21b66a1 100644 +index a03ef14..9d073e6 100644 --- a/PDALConfig.cmake.in +++ b/PDALConfig.cmake.in -@@ -18,6 +18,7 @@ endforeach(_dir) - include(CMakeFindDependencyMacro) - find_dependency(GeoTIFF) - find_dependency(CURL) +@@ -15,6 +15,11 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@) + list(APPEND PDAL_LIBRARY_DIRS ${_foo}) + endforeach(_dir) + ++include(CMakeFindDependencyMacro) ++find_dependency(GeoTIFF) ++find_dependency(CURL) +find_dependency(Boost COMPONENTS system filesystem) ++find_dependency(geos CONFIG) include("${CMAKE_CURRENT_LIST_DIR}/PDALTargets.cmake") if (WIN32) |