diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/pdal | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/pdal')
| -rw-r--r-- | ports/pdal/0003-fix-copy-vendor.patch | 9 | ||||
| -rw-r--r-- | ports/pdal/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pdal/portfile.cmake | 7 |
3 files changed, 12 insertions, 6 deletions
diff --git a/ports/pdal/0003-fix-copy-vendor.patch b/ports/pdal/0003-fix-copy-vendor.patch index a29ad9018..3aad7af32 100644 --- a/ports/pdal/0003-fix-copy-vendor.patch +++ b/ports/pdal/0003-fix-copy-vendor.patch @@ -33,6 +33,15 @@ index 43e446a..c4c7d6f 100644 #
# CPACK
+@@ -348,7 +373,7 @@ add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+
+ export(
+ TARGETS
+- ${PDAL_BASE_LIB_NAME} ${PDAL_UTIL_LIB_NAME}
++ ${PDAL_BASE_LIB_NAME} ${PDAL_ARBITER_LIB_NAME} ${PDAL_KAZHDAN_LIB_NAME} ${PDAL_UTIL_LIB_NAME}
+ FILE
+ "${PDAL_BINARY_DIR}/PDALTargets.cmake")
+
diff --git a/cmake/directories.cmake b/cmake/directories.cmake
index f079ec7..8e366e8 100644
--- a/cmake/directories.cmake
diff --git a/ports/pdal/CONTROL b/ports/pdal/CONTROL index 7c465df4e..9dbec2ab9 100644 --- a/ports/pdal/CONTROL +++ b/ports/pdal/CONTROL @@ -1,4 +1,4 @@ Source: pdal
-Version: 1.7.1-5
+Version: 1.7.1-6
Description: PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.
Build-Depends: gdal, geos, jsoncpp, libgeotiff, laszip
diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 650849224..6961199a7 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -1,10 +1,7 @@ -# vcpkg portfile.cmake for PDAL -# -# NOTE: update the version string for new PDAL release -set(PDAL_VERSION_STR "1.7.1") - include(vcpkg_common_functions) +set(PDAL_VERSION_STR "1.7.1") + vcpkg_download_distfile(ARCHIVE URLS "http://download.osgeo.org/pdal/PDAL-${PDAL_VERSION_STR}-src.tar.gz" FILENAME "PDAL-${PDAL_VERSION_STR}-src.tar.gz" |