pdal: migrate to Conan v2, bump to v2.6.0, unvendor all available packages

recipes/pdal/all/CMakeLists.txt

@@ -1,9 +1,48 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.13)
 project(cmake_wrapper)
 
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(KEEP_RPATHS)
+macro(custom_find_package name)
+    find_package(${name} ${ARGN})
+    string(TOUPPER ${name} name_upper)
+    set(${name_upper}_FOUND ${${name}_FOUND})
+    set(${name_upper}_VERSION_STRING ${${name}_VERSION_STRING})
+    set(${name_upper}_INCLUDE_DIRS ${${name}_INCLUDE_DIRS})
+    set(${name_upper}_INCLUDE_DIR ${${name}_INCLUDE_DIR})
+    set(${name_upper}_LIBRARIES ${${name}_LIBRARIES})
+    set(${name_upper}_DEFINITIONS ${${name}_DEFINITIONS})
+    unset(name_upper)
+endmacro()
 
-find_package(Boost REQUIRED filesystem)
+# Unvendored dependencies
+find_package(Eigen3 REQUIRED CONFIG)
+link_libraries(Eigen3::Eigen)
 
-add_subdirectory("source_subfolder")
+find_package(nanoflann REQUIRED CONFIG)
+link_libraries(nanoflann::nanoflann)
+
+find_package(nlohmann_json REQUIRED CONFIG)
+link_libraries(nlohmann_json::nlohmann_json)
+include_directories(BEFORE src/vendor/nlohmann)
+
+find_package(nlohmann_json_schema_validator REQUIRED CONFIG)
+set(JSON_SCHEMA_LIB_NAME nlohmann_json_schema_validator)
+link_libraries(nlohmann_json_schema_validator)
+
+find_package(arbiter REQUIRED CONFIG)
+set(PDAL_ARBITER_LIB_NAME arbiter::arbiter)
+
+find_package(utf8cpp REQUIRED CONFIG)
+set(UTFCPP_INCLUDE_DIR ${utf8cpp_INCLUDE_DIR})
+set(UTFCPP_LIB_NAME utf8::cpp)
+
+# Use custom_find_package to ensure that the dependency vars use compatible capitalization
+custom_find_package(GDAL REQUIRED CONFIG)
+custom_find_package(GeoTIFF REQUIRED MODULE)
+custom_find_package(LibLZMA CONFIG)
+custom_find_package(LibXml2 QUIET MODULE)
+custom_find_package(Libunwind QUIET CONFIG)
+custom_find_package(ZLIB QUIET CONFIG)
+custom_find_package(proj REQUIRED CONFIG)
+custom_find_package(zstd QUIET CONFIG)
+
+add_subdirectory(src)

recipes/pdal/all/conandata.yml

@@ -1,28 +1,9 @@
 sources:
-  "2.3.0":
-    url: "https://github.com/PDAL/PDAL/releases/download/2.3.0/PDAL-2.3.0-src.tar.bz2"
-    sha256: "63d8d4fee491675f0fa3dca58c26d57fb2afcaa37c24b10f595b3fbff174996e"
-  "2.2.0":
-    url: "https://github.com/PDAL/PDAL/releases/download/2.2.0/PDAL-2.2.0-src.tar.bz2"
-    sha256: "7f6406d8f6536701f28f215d7b77c2c476f2fa100c1a391ebbcc868210114273"
+  "2.6.3":
+    url: "https://github.com/PDAL/PDAL/releases/download/2.6.3/PDAL-2.6.3-src.tar.bz2"
+    sha256: "e4d90a3ce4c9681cd3522ca29e73a88ff3b3c713f918693ad03932a6b7680460"
 patches:
-  "2.3.0":
-    - patch_file: "patches/0001-cmakelists.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/0002-cmake-deps-2.3.0.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/0005-vendor-nanoflann.patch"
-      base_path: "source_subfolder"
-  "2.2.0":
-    - patch_file: "patches/0001-cmakelists.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/0002-cmake-deps-2.2.0.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/0003-stdexcept.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/0004-cstdlib.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/0005-vendor-nanoflann.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/0006-pointview.patch"
-      base_path: "source_subfolder"
+  "2.6.3":
+    - patch_file: "patches/2.6.0-001-nanoflann-1.5.patch"
+      patch_type: "portability"
+      patch_description: "Add support for nanoflann v1.5.0"