From 9fde6434a11f3fc4b1a2d40b24e9f6f70f70fdac Mon Sep 17 00:00:00 2001 From: Matt Leotta Date: Tue, 26 Jan 2021 10:10:53 -0500 Subject: [PATCH 1/3] added option to build PDAL 2.2.0 --- CMake/fletch-tarballs.cmake | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CMake/fletch-tarballs.cmake b/CMake/fletch-tarballs.cmake index 643af5f5..36fb915f 100644 --- a/CMake/fletch-tarballs.cmake +++ b/CMake/fletch-tarballs.cmake @@ -376,9 +376,16 @@ endif() list(APPEND fletch_external_sources GDAL) # PDAL -set(PDAL_version 1.7.2) +set(PDAL_SELECT_VERSION 1.7.2 CACHE STRING "Select the version of PDAL to build.") +set_property(CACHE PDAL_SELECT_VERSION PROPERTY STRINGS "1.7.2" "2.2.0") + +set(PDAL_version ${PDAL_SELECT_VERSION}) set(PDAL_url "https://github.com/PDAL/PDAL/releases/download/${PDAL_version}/PDAL-${PDAL_version}-src.tar.gz") -set(PDAL_md5 "a89710005fd54e6d2436955e2e542838") +if (PDAL_version VERSION_EQUAL 1.7.2) + set(PDAL_md5 "a89710005fd54e6d2436955e2e542838") +else() + set(PDAL_md5 "52d84c5b64b7cd30770a225e3d13fce3") +endif() list(APPEND fletch_external_sources PDAL) # GeographicLib From a4a1c310a5fce70bbef46100cae561ba4aa24821 Mon Sep 17 00:00:00 2001 From: Matt Leotta Date: Tue, 26 Jan 2021 10:12:00 -0500 Subject: [PATCH 2/3] added release note --- Doc/release-notes/master.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Doc/release-notes/master.txt b/Doc/release-notes/master.txt index 8f37bdab..f8d1ed18 100644 --- a/Doc/release-notes/master.txt +++ b/Doc/release-notes/master.txt @@ -18,6 +18,7 @@ Updates since v1.4.0 * Remove support for OpenCV 2 * Add VTK version 9.0.1 * Update PyBind11 from 2.2.1 to 2.5.0 + * Add and optional PDAL update to version 2.2.0 Fixes since v1.4.0 ------------------ From f96d2462d14e4bce34ef65a19eb5e541edf541a4 Mon Sep 17 00:00:00 2001 From: Matt Leotta Date: Tue, 26 Jan 2021 10:12:53 -0500 Subject: [PATCH 3/3] make PDAL 2.2.0 the default --- CMake/fletch-tarballs.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/fletch-tarballs.cmake b/CMake/fletch-tarballs.cmake index 36fb915f..fb0a58f9 100644 --- a/CMake/fletch-tarballs.cmake +++ b/CMake/fletch-tarballs.cmake @@ -376,7 +376,7 @@ endif() list(APPEND fletch_external_sources GDAL) # PDAL -set(PDAL_SELECT_VERSION 1.7.2 CACHE STRING "Select the version of PDAL to build.") +set(PDAL_SELECT_VERSION 2.2.0 CACHE STRING "Select the version of PDAL to build.") set_property(CACHE PDAL_SELECT_VERSION PROPERTY STRINGS "1.7.2" "2.2.0") set(PDAL_version ${PDAL_SELECT_VERSION})