Mirrors/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2026-01-18 01:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[pdal] Update to 2.9.3 (#48721)

Browse Source
This commit is contained in:
Kai Pastor
2025-12-09 03:50:43 +01:00
committed by GitHub
parent f87f57974b
commit e308c8cab9
8 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ports/pdal-dimbuilder/portfile.cmake
View File

@@ -9,7 +9,7 @@ vcpkg_from_github(
#[[
Attention: pdal must be updated together with pdal-dimbuilder
#]]
SHA512 4816c1ef8946937440541b5b8214dd5cbe706ccfbb82e5d67652e983eb6b386a02c1e0ba8ae7e22a0298a65b93953953bc4738d15a33f0f67a39dd6e48dfc076
SHA512 7ed8300bf700abf79314aa3f9867d05a0ae077e4a8d4940a19f91c89869cfe2dfbe0d1ba5679d8457e64adcf1f924dec46686d022bfd6046657ab829795059a7
HEAD_REF master
PATCHES
namespace-nl.diff

4
ports/pdal-dimbuilder/vcpkg.json
View File

@@ -1,8 +1,8 @@
{
"name": "pdal-dimbuilder",
"version": "2.9.2",
"version": "2.9.3",
"description": "A tool used by the PDAL build process",
"homepage": "https://pdal.io/",
"homepage": "https://pdal.org/",
"license": "BSD-3-Clause",
"supports": "native",
"dependencies": [

32
ports/pdal/dependencies.diff
View File

@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc65543..5bccbce 100644
index ca5a692..e0651b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,12 +158,9 @@ if (WITH_TESTS)
@@ -161,12 +161,9 @@ if (WITH_TESTS)
endif()
add_subdirectory(dimbuilder)
add_subdirectory(vendor/arbiter)
@@ -31,7 +31,7 @@ index dc65543..5bccbce 100644
target_include_directories(${PDAL_LIB_NAME}
PRIVATE
${ROOT_DIR}
@@ -263,6 +261,8 @@ target_link_libraries(${PDAL_LIB_NAME}
@@ -269,6 +267,8 @@ target_link_libraries(${PDAL_LIB_NAME}
${PDAL_LIBDIR}
${WINSOCK_LIBRARY}
)
@@ -40,7 +40,7 @@ index dc65543..5bccbce 100644
if (ZSTD_FOUND)
target_link_libraries(${PDAL_LIB_NAME}
@@ -307,9 +307,6 @@ target_include_directories(${PDAL_LIB_NAME}
@@ -304,9 +304,6 @@ target_include_directories(${PDAL_LIB_NAME}
INTERFACE
$<INSTALL_INTERFACE:include>)
@@ -50,20 +50,6 @@ index dc65543..5bccbce 100644
if(WIN32)
target_compile_definitions(${PDAL_LIB_NAME}
diff --git a/cmake/gdal.cmake b/cmake/gdal.cmake
index 5f68579..a407c60 100644
--- a/cmake/gdal.cmake
+++ b/cmake/gdal.cmake
@@ -12,7 +12,8 @@ function(gdal_find_version _version)
set(${_version} ${MAJOR}.${MINOR}.${REV} PARENT_SCOPE)
endfunction(gdal_find_version)
-find_package(GDAL 3.4 REQUIRED)
+find_package(GDAL CONFIG REQUIRED)
+set(GDAL_LIBRARY GDAL::GDAL)
set_package_properties(GDAL PROPERTIES TYPE REQUIRED
PURPOSE "Provides general purpose raster, vector, and reference system support")
if (GDAL_FOUND)
diff --git a/cmake/h3.cmake b/cmake/h3.cmake
index 398ad6d..fb3c9ad 100644
--- a/cmake/h3.cmake
@@ -102,7 +88,7 @@ index 6543ff6..dc6fac8 100644
set(UTFCPP_LIB_NAME utf8::cpp)
diff --git a/pdal/JsonFwd.hpp b/pdal/JsonFwd.hpp
index f764961..f64dcc6 100644
index 507c456..6b502d0 100644
--- a/pdal/JsonFwd.hpp
+++ b/pdal/JsonFwd.hpp
@@ -1,3 +1,4 @@
@@ -152,14 +138,14 @@ index 473ffba..a69431f 100644
params.sorted = true;
diff --git a/tools/lasdump/CMakeLists.txt b/tools/lasdump/CMakeLists.txt
index b15d595..a452d14 100644
index d0d4d64..595d724 100644
--- a/tools/lasdump/CMakeLists.txt
+++ b/tools/lasdump/CMakeLists.txt
@@ -10,6 +10,7 @@ add_executable(lasdump
@@ -11,6 +11,7 @@ add_executable(lasdump
)
target_link_libraries(lasdump PRIVATE
+ ${UTFCPP_LIB_NAME}
${PDAL_LAZPERF_LIB_NAME}
${GDAL_LIBRARY}
)
GDAL::GDAL
"$<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:-lstdc++fs>"

2
ports/pdal/portfile.cmake
View File

@@ -7,7 +7,7 @@ vcpkg_from_github(
#[[
Attention: pdal-dimbuilder must be updated together with pdal
#]]
SHA512 4816c1ef8946937440541b5b8214dd5cbe706ccfbb82e5d67652e983eb6b386a02c1e0ba8ae7e22a0298a65b93953953bc4738d15a33f0f67a39dd6e48dfc076
SHA512 7ed8300bf700abf79314aa3f9867d05a0ae077e4a8d4940a19f91c89869cfe2dfbe0d1ba5679d8457e64adcf1f924dec46686d022bfd6046657ab829795059a7
HEAD_REF master
PATCHES
dependencies.diff

5
ports/pdal/vcpkg.json
View File

@@ -1,9 +1,8 @@
{
"name": "pdal",
"version": "2.9.2",
"port-version": 1,
"version": "2.9.3",
"description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.",
"homepage": "https://pdal.io/",
"homepage": "https://pdal.org/",
"license": null,
"supports": "!(static & staticcrt)",
"dependencies": [

6
versions/baseline.json
View File

@@ -7489,15 +7489,15 @@
"port-version": 0
},
"pdal": {
"baseline": "2.9.2",
"port-version": 1
"baseline": "2.9.3",
"port-version": 0
},
"pdal-c": {
"baseline": "2.2.0",
"port-version": 0
},
"pdal-dimbuilder": {
"baseline": "2.9.2",
"baseline": "2.9.3",
"port-version": 0
},
"pdcurses": {

5
versions/p-/pdal-dimbuilder.json
View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8687cce78c4d9f68d0dd6e1e50b4b69b6428afa4",
"version": "2.9.3",
"port-version": 0
},
{
"git-tree": "6f3b1da2af5d472fc0f60b491cb048ee5e2af51e",
"version": "2.9.2",

5
versions/p-/pdal.json
View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8efcd67d1e86d4e04f46deb12a799fdb35dddbd7",
"version": "2.9.3",
"port-version": 0
},
{
"git-tree": "3f2f42e69bebf88e97b47d1c0d4ed9abde4b23f8",
"version": "2.9.2",