From 972512ef932e06370c574f566a1d67eab7692066 Mon Sep 17 00:00:00 2001 From: Chet Nieter Date: Fri, 26 Sep 2025 12:23:44 -0400 Subject: [PATCH 1/5] Added PDAL 2.9.2 as an option --- CMake/fletch-tarballs.cmake | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/CMake/fletch-tarballs.cmake b/CMake/fletch-tarballs.cmake index 28c82f10..891406fc 100644 --- a/CMake/fletch-tarballs.cmake +++ b/CMake/fletch-tarballs.cmake @@ -381,7 +381,7 @@ list(APPEND fletch_external_sources OpenCV) # SQLite3 if (fletch_ENABLE_SQLite3 OR fletch_ENABLE_ALL_PACKAGES) - set(SQLite3_SELECT_VERSION 3.35.2 CACHE STRING "Select the major version of GDAL to build.") + set(SQLite3_SELECT_VERSION 3.35.2 CACHE STRING "Select the major version of SQLite3 to build.") set_property(CACHE SQLite3_SELECT_VERSION PROPERTY STRINGS "3.45.3" "3.35.2") message(STATUS "SQLite3 Select version: ${SQLite3_SELECT_VERSION}") if (SQLite3_SELECT_VERSION VERSION_EQUAL 3.45.3) @@ -461,9 +461,20 @@ endif() list(APPEND fletch_external_sources GDAL) # PDAL -set(PDAL_version 1.7.2) -set(PDAL_url "https://data.kitware.com/api/v1/file/6622b24edf5a87675edbc0d0/download/pdal.${PDAL_version}.tar.gz") -set(PDAL_md5 "a89710005fd54e6d2436955e2e542838") +if (fletch_ENABLE_PDAL OR fletch_ENABLE_ALL_PACKAGES) + set(PDAL_SELECT_VERSION 1.7.2 CACHE STRING "Select the major version of PDAL to build.") + set_property(CACHE PDAL_SELECT_VERSION PROPERTY STRINGS "2.9.2" "1.7.2") + message(STATUS "PDAL Select version: ${PDAL_SELECT_VERSION}") + if (PDAL_SELECT_VERSION VERSION_EQUAL 2.9.2) + set(PDAL_version "2.9.2") + set(PDAL_url "https://data.kitware.com/api/v1/file/68d46bccaf4f192121e8168d/download/pdal.${PDAL_version}.tar.gz") + set(PDAL_md5 "f01e30e3e6aeb441488de11df93dee2c") + elseif (PDAL_SELECT_VERSION VERSION_EQUAL 1.7.2) + set(PDAL_version "1.7.2") + set(PDAL_url "https://data.kitware.com/api/v1/file/6622b24edf5a87675edbc0d0/download/pdal.${PDAL_version}.tar.gz") + set(PDAL_md5 "a89710005fd54e6d2436955e2e542838") + endif() +endif() list(APPEND fletch_external_sources PDAL) # GeographicLib From 2049d0208bff3c0cbdc8d141fd7c0691c3fe898a Mon Sep 17 00:00:00 2001 From: Chet Nieter Date: Fri, 26 Sep 2025 12:32:41 -0400 Subject: [PATCH 2/5] Updated release notes --- 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 bf8b2900..56718385 100644 --- a/Doc/release-notes/master.txt +++ b/Doc/release-notes/master.txt @@ -7,5 +7,6 @@ Updates since v1.6.1 -------------------- * Made GDAL version 3.11.0 available for Linux builds +* Made PDAL version 2.9.2 available as an option * Made PROJ version 9.6.2 available as an option * Make SQLite version 3.45.3 available as an option From 0678032d4149239783b78f3dd8bb39bd25ee2353 Mon Sep 17 00:00:00 2001 From: Chet Nieter Date: Fri, 26 Sep 2025 15:01:52 -0400 Subject: [PATCH 3/5] Using UNIX rather than LINUX to check os for GDAL --- CMake/External_GDAL.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/External_GDAL.cmake b/CMake/External_GDAL.cmake index c2a70c70..34b4ef7b 100644 --- a/CMake/External_GDAL.cmake +++ b/CMake/External_GDAL.cmake @@ -25,7 +25,7 @@ if(fletch_LTIDSDK_ROOT) endif() if (GDAL_SELECT_VERSION VERSION_GREATER_EQUAL 3.5) - if (NOT LINUX) + if (NOT UNIX) message(ERROR "Fletch currenly only supports building GDAL Version \"${GDAL_SELECT_VERSION}\" for Linux.") else() if(fletch_ENABLE_PROJ) From 1a0bc38385d5d19d0a9227bd988af8b1918bb39d Mon Sep 17 00:00:00 2001 From: Chet Nieter Date: Mon, 29 Sep 2025 12:40:47 -0400 Subject: [PATCH 4/5] Added libtiff as a dependency for updated PROJ --- CMake/External_PROJ.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CMake/External_PROJ.cmake b/CMake/External_PROJ.cmake index 92e5f55d..a0137299 100644 --- a/CMake/External_PROJ.cmake +++ b/CMake/External_PROJ.cmake @@ -9,6 +9,16 @@ else() find_package(SQLite3 REQUIRED) endif() +# Latest version of PROJ requires libtiff +if (PROJ_version VERSION_EQUAL 9.6.2) + if(fletch_ENABLE_libtiff) + message(STATUS "PROJ depending on internal libtiff") + list(APPEND PROJ_DEPENDS libtiff) + else() + find_package(TIFF REQUIRED) + endif() +endif() + ExternalProject_Add(PROJ DEPENDS ${PROJ_DEPENDS} URL ${PROJ_file} From 163b903a36366952f457ae643aaf2f355ead01f8 Mon Sep 17 00:00:00 2001 From: Chet Nieter Date: Mon, 29 Sep 2025 16:18:58 -0400 Subject: [PATCH 5/5] Pushed minimal cmake version to 3.6.0 Pushed minimal cmake version to 3.6.0 to fix issues with building the python ci container for kwiver. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a2544627..0e0c32e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3.0) +cmake_minimum_required(VERSION 3.6.0) project(fletch) # Policy to address @foo@ variable expansion