Skip to content

Added PDAL 2.9.2 as an option #772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Added PDAL 2.9.2 as an option #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
972512e
Added PDAL 2.9.2 as an option
chetnieter Sep 26, 2025
2049d02
Updated release notes
chetnieter Sep 26, 2025
0678032
Using UNIX rather than LINUX to check os for GDAL
chetnieter Sep 26, 2025
1a0bc38
Added libtiff as a dependency for updated PROJ
chetnieter Sep 29, 2025
163b903
Pushed minimal cmake version to 3.6.0
chetnieter Sep 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMake/External_GDAL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
message(ERROR "Fletch currenly only supports building GDAL Version \"${GDAL_SELECT_VERSION}\" for Linux.")
message(ERROR "Fletch currently only supports building GDAL Version \"${GDAL_SELECT_VERSION}\" for Unix.")

else()
if(fletch_ENABLE_PROJ)
Expand Down
10 changes: 10 additions & 0 deletions CMake/External_PROJ.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
19 changes: 15 additions & 4 deletions CMake/fletch-tarballs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add an else here (example: SQLite3 above)?

endif()
list(APPEND fletch_external_sources PDAL)

# GeographicLib
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions Doc/release-notes/master.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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