Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions CMake/External_GDAL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ if(fletch_LTIDSDK_ROOT)
endif()

if (GDAL_SELECT_VERSION VERSION_GREATER_EQUAL 3.5)
if (NOT LINUX)
message(ERROR "Fletch currenly only supports building GDAL Version \"${GDAL_SELECT_VERSION}\" for Linux.")
if (NOT UNIX)
message(ERROR "Fletch currently only supports building GDAL Version \"${GDAL_SELECT_VERSION}\" for Unix.")
else()
if(fletch_ENABLE_PROJ)
set(_GDAL_ARGS_PROJ
Expand Down
21 changes: 17 additions & 4 deletions CMake/fletch-tarballs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,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 @@ -475,9 +475,22 @@ 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")
else()
message(STATUS "PDAL_SELECT_VERSION ${PDAL_SELECT_VERSION}: Not supported")
endif()
endif()
list(APPEND fletch_external_sources PDAL)

# GeographicLib
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
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
4 changes: 1 addition & 3 deletions Doc/release-notes/master.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@ This is a minor release of Fletch that provides both new functionality and fixes
Updates since v1.7.0
--------------------

Fixes since 1.7.0
-----------------

* Made PDAL version 2.9.2 available as an option