Compare commits
15 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 395c3185a0 | |||
|
|
ef9e4ff481 | ||
|
|
e97d94fa14 | ||
| 2898d24b35 | |||
| d6b1e65733 | |||
| 3810bc8e93 | |||
|
|
45141532c2 | ||
| 591a1124f3 | |||
|
|
d7307f7950 | ||
| d042017652 | |||
| f7f7425e56 | |||
| c7a4fdc3bc | |||
| 10b2dcdb09 | |||
| ec788186d7 | |||
|
|
e3bff5f1ca |
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8a6d7646912a4e7a382f06451b14a1f5f2e8aa4e0b391dc91c30701222198b77
|
||||
size 87483358
|
||||
@@ -1 +0,0 @@
|
||||
8a6d7646912a4e7a382f06451b14a1f5f2e8aa4e0b391dc91c30701222198b77 PDAL-2.8.0-src.tar.bz2
|
||||
3
PDAL-2.9.3-src.tar.bz2
Normal file
3
PDAL-2.9.3-src.tar.bz2
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:22e90c8b9653e2bd0eb24efbe071b6c281e972145b47c0ccfdc329d73c188d9c
|
||||
size 97583890
|
||||
1
PDAL-2.9.3-src.tar.bz2.sha256sum
Normal file
1
PDAL-2.9.3-src.tar.bz2.sha256sum
Normal file
@@ -0,0 +1 @@
|
||||
22e90c8b9653e2bd0eb24efbe071b6c281e972145b47c0ccfdc329d73c188d9c PDAL-2.9.3-src.tar.bz2
|
||||
54
PDAL-fix-gdal-includes.patch
Normal file
54
PDAL-fix-gdal-includes.patch
Normal file
@@ -0,0 +1,54 @@
|
||||
diff --git i/pdal/util/VSIIO.cpp w/pdal/util/VSIIO.cpp
|
||||
index c80536d7f..6e328f173 100644
|
||||
--- i/pdal/util/VSIIO.cpp
|
||||
+++ w/pdal/util/VSIIO.cpp
|
||||
@@ -36,8 +36,8 @@
|
||||
#include <sstream>
|
||||
#include <streambuf>
|
||||
|
||||
-#include <cpl_vsi.h>
|
||||
-#include <cpl_vsi_virtual.h>
|
||||
+#include <gdal/cpl_vsi.h>
|
||||
+#include <gdal/cpl_vsi_virtual.h>
|
||||
#include <pdal/util/FileUtils.hpp>
|
||||
#include <pdal/util/VSIIO.hpp>
|
||||
#include <pdal/pdal_types.hpp>
|
||||
diff --git i/test/unit/SpatialReferenceTest.cpp w/test/unit/SpatialReferenceTest.cpp
|
||||
index f0c92e948..9336da897 100644
|
||||
--- i/test/unit/SpatialReferenceTest.cpp
|
||||
+++ w/test/unit/SpatialReferenceTest.cpp
|
||||
@@ -44,7 +44,7 @@
|
||||
#include <io/LasReader.hpp>
|
||||
#include <io/LasWriter.hpp>
|
||||
|
||||
-#include <gdal_version.h>
|
||||
+#include <gdal/gdal_version.h>
|
||||
|
||||
#include <pdal/pdal_features.hpp>
|
||||
|
||||
diff --git i/test/unit/io/CopcWriterTest.cpp w/test/unit/io/CopcWriterTest.cpp
|
||||
index 0585f4d87..bc4ca0ed0 100644
|
||||
--- i/test/unit/io/CopcWriterTest.cpp
|
||||
+++ w/test/unit/io/CopcWriterTest.cpp
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
#include "Support.hpp"
|
||||
|
||||
-#include <gdal_version.h>
|
||||
+#include <gdal/gdal_version.h>
|
||||
|
||||
namespace pdal
|
||||
{
|
||||
diff --git i/test/unit/io/LasWriterTest.cpp w/test/unit/io/LasWriterTest.cpp
|
||||
index ceb31d2b3..06c576fbd 100644
|
||||
--- i/test/unit/io/LasWriterTest.cpp
|
||||
+++ w/test/unit/io/LasWriterTest.cpp
|
||||
@@ -51,7 +51,7 @@
|
||||
#include <io/private/las/Header.hpp>
|
||||
#include <io/private/las/Vlr.hpp>
|
||||
|
||||
-#include <gdal_version.h>
|
||||
+#include <gdal/gdal_version.h>
|
||||
|
||||
#include "Support.hpp"
|
||||
|
||||
28743
PDAL-remove-gtest.patch
Normal file
28743
PDAL-remove-gtest.patch
Normal file
File diff suppressed because it is too large
Load Diff
110
PDAL.changes
110
PDAL.changes
@@ -1,3 +1,113 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 18 07:16:54 UTC 2025 - Enno Tensing <tenno+suse@suij.in>
|
||||
|
||||
- Fix URL entry in PDAL.spec
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Dec 14 10:01:50 UTC 2025 - Enno Tensing <tenno+suse@suij.in>
|
||||
|
||||
- Update to PDAL 2.9.3
|
||||
* Alias PDAL_DLL => PDAL_EXPORT and warn users to upgrade if it is defined (PR #4813)
|
||||
* Suppress error messages from GDAL/PROJ when infering metadata type SRSs (PR #4820)
|
||||
* Add min_clamp, max_clamp, and nodata options to filters.hag_dem (PR #4828)
|
||||
* Support 0 as variable chunk indicator in LAZ/COPC files (PR #4843)
|
||||
* Emit warnings for pdal tindex hexbin boundary failures (PR #4844)
|
||||
* Fix Connector segfault on 404 from /vsis3/ path (PR #4853)
|
||||
* Add class argument for hag_delaunay, hag_dem and hag_nn filters (PR #4865)
|
||||
* Remove dead code from Kazhdan's ply.h (PR #4866)
|
||||
* Only specify JSON-compatible types when serializing pipelines (PR #4877)
|
||||
* Add custom class arguments for ground classification filters (PR #4879)
|
||||
* Documentation updates
|
||||
* Update minimum GDAL verstion to 3.8
|
||||
* Migrates PDAL.io to PDAL.org
|
||||
* Update PDAL-fix-gdal-includes.patch to cover more GDAL includes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 11 17:17:31 UTC 2025 - Enno Tensing <tenno+suse@suij.in>
|
||||
|
||||
- Update to PDAL 2.9.2
|
||||
* Add PDAL-remove-gtest.patch to remove the venored gtest, which was
|
||||
re-added by 2.9.1
|
||||
* PDAL 2.9.1 contained the following changes:
|
||||
+ Sorting behaviour was changed, due to issues on Windows
|
||||
+ Fixed build issues and compiler warnings
|
||||
+ pdal --info will now return the same data as the python library's
|
||||
pipeline.quickinfo
|
||||
+ Adds support for Arrow 21+
|
||||
+ Adds protection against empty views to some filters
|
||||
+ Adds new Radius assign filter
|
||||
+ Venored gtest was added back, with intent to drop again for 2.10
|
||||
* PDAL 2.9.2 contains the following changes:
|
||||
+ Vendored arbiter now has a custom pdal namespace
|
||||
+ VSIIO will now call fp->Flush() when syncing the VSIStreamBuffer
|
||||
+ StageWrapper will no longer run on empty views
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jun 29 06:52:23 UTC 2025 - Enno Tensing <tenno+suse@suij.in>
|
||||
|
||||
- Update to PDAL 2.9.0
|
||||
* Refresh PDAL_unbundle.patch
|
||||
* Add new PDAL-fix-gdal-includes.patch, fixing GDAL includes
|
||||
* Add gtest as dependency, required for tests and dropped from
|
||||
PDAL as a vendored copy
|
||||
* Release notes can be found at https://github.com/PDAL/PDAL/releases/tag/2.9.0
|
||||
Some of the listed changes are:
|
||||
+ Add GDAL VSI support
|
||||
+ Add FileSpec support
|
||||
+ Remove vendored nlohmann_json copy
|
||||
+ Add SPZ reader and writer
|
||||
+ Add supervoxel filter
|
||||
+ Improve various filters, readers and commands
|
||||
+ Update vendored delaunator dependency
|
||||
+ Various bug fixes
|
||||
+ Source tree cleanups
|
||||
+ Use modern CMake targets for libraries
|
||||
+ Symbol export macro has been renamed from PDAL_DLL to PDAL_EXPORT
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 3 20:22:09 UTC 2025 - Enno Tensing <tenno+suse@suij.in>
|
||||
|
||||
- Update to 2.8.4; Upstream lists the following changes:
|
||||
* Handle null strings as tests for startsWith and endsWith. by @hobu in #4606
|
||||
* add zenodo citation information by @hobu in #4612
|
||||
* Add new section to pipeline docs: "multiple writers and output types" by @hobu in #4613
|
||||
* Use gdal_fwd.hpp when available for forward declarations by @hobu in #4614
|
||||
* Source tree cleanups by @hobu in #4616
|
||||
* fixes md5 link to 2.8.3 by @smellman in #4617
|
||||
* Define destructor in source file for CSFilter. by @hobu in #4621
|
||||
* upload .conda files from conda package build CI by @hobu in #4626
|
||||
* Update include directives for LasReader and LasHeader in transition from libLAS to PDAL guide by @hobu in #4635
|
||||
* Fix bad calculation for max width cases in readers.copc by @hobu in #4640
|
||||
* Read quickinfo or filters.stats to create TileDB array by @hobu in #4642
|
||||
See https://github.com/PDAL/PDAL/releases/tag/2.8.4 and
|
||||
https://github.com/PDAL/PDAL/compare/2.8.3...2.8.4 for more information
|
||||
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 15 13:17:19 UTC 2025 - Enno Tensing <tenno+suse@suij.in>
|
||||
|
||||
- Update tp 2.8.3
|
||||
* See PDAL changelog at https://github.com/PDAL/PDAL/releases/tag/2.8.3
|
||||
* For commits between 2.8.2 and 2.8.3 see
|
||||
https://github.com/PDAL/PDAL/compare/2.8.2...2.8.3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 4 19:20:45 UTC 2024 - Enno Tensing <tenno+suse@suij.in>
|
||||
|
||||
- Update to 2.8.2
|
||||
* See PDAL changelog at https://github.com/PDAL/PDAL/releases/tag/2.8.2
|
||||
* For commits between 2.8.1 and 2.8.2 see
|
||||
https://github.com/PDAL/PDAL/compare/2.8.1...2.8.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 25 21:51:44 UTC 2024 - Enno Tensing <tenno+suse@suij.in>
|
||||
|
||||
- Update to 2.8.1
|
||||
* See PDAL changelog at https://github.com/PDAL/PDAL/releases/tag/2.8.1
|
||||
* For detailed changes between 2.8.0 and 2.8.1 see
|
||||
https://github.com/PDAL/PDAL/compare/2.8.0...2.8.1
|
||||
* Refresh PDAL_unbundle.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 22 18:36:23 UTC 2024 - Enno Tensing <tenno+suse@suij.in>
|
||||
|
||||
|
||||
34
PDAL.spec
34
PDAL.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package PDAL
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2021 Friedmann Bruno, Ioda-Net Sàrl, Charmoille, Switzerland.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@@ -17,11 +17,11 @@
|
||||
#
|
||||
|
||||
|
||||
%define soname 18
|
||||
%define sovers 18.0.0
|
||||
%define soname 19
|
||||
%define sovers 19.3.0
|
||||
%define lname pdal
|
||||
Name: PDAL
|
||||
Version: 2.8.0
|
||||
Version: 2.9.3
|
||||
Release: 1
|
||||
Summary: Point Data Abstraction Library (GDAL for point cloud data)
|
||||
# The code is licensed BSD except for:
|
||||
@@ -31,12 +31,17 @@ Summary: Point Data Abstraction Library (GDAL for point cloud data)
|
||||
# - plugins/e57/libE57Format/{src,include}/* is Boost 1-0
|
||||
License: Apache-2.0 AND BSD-3-Clause AND MIT AND BSL-1.0
|
||||
Group: Productivity/Graphics/CAD
|
||||
URL: https://www.pdal.io/
|
||||
URL: https://pdal.org/
|
||||
Source0: https://github.com/PDAL/PDAL/releases/download/%{version}/%{name}-%{version}-src.tar.bz2
|
||||
Source1: https://github.com/PDAL/PDAL/releases/download/%{version}/%{name}-%{version}-src.tar.bz2.sha256sum
|
||||
# Unbundle some bundled libraries inspired by Fedora work at
|
||||
# https://src.fedoraproject.org/rpms/PDAL/blob/rawhide/f/PDAL_unbundle.patch
|
||||
# Upstream is not interested in this patch/change, so we'll have to keep it around
|
||||
Patch0: PDAL_unbundle.patch
|
||||
# GDAL headers are located in %{_includedir}/gdal
|
||||
Patch1: PDAL-fix-gdal-includes.patch
|
||||
# Drop venored gtest
|
||||
Patch2: PDAL-remove-gtest.patch
|
||||
BuildRequires: bash-completion
|
||||
BuildRequires: cairo-devel
|
||||
BuildRequires: cmake >= 2.8
|
||||
@@ -45,9 +50,8 @@ BuildRequires: curl-devel
|
||||
BuildRequires: eigen3-devel
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: freeglut-devel
|
||||
BuildRequires: gdal
|
||||
BuildRequires: gdal >= 3.8
|
||||
BuildRequires: geotiff-devel
|
||||
BuildRequires: gtest
|
||||
BuildRequires: jsoncpp-devel
|
||||
BuildRequires: libboost_filesystem-devel
|
||||
BuildRequires: libboost_headers-devel
|
||||
@@ -55,6 +59,7 @@ BuildRequires: libboost_program_options-devel
|
||||
BuildRequires: libgdal-devel
|
||||
BuildRequires: libgeos-devel
|
||||
BuildRequires: libopenssl-devel >= 1.1
|
||||
BuildRequires: nlohmann_json-devel
|
||||
BuildRequires: proj-devel
|
||||
# Needed to have proj.db for tests
|
||||
BuildRequires: libpsl5
|
||||
@@ -72,6 +77,7 @@ BuildRequires: sqlite3-devel
|
||||
BuildRequires: xz-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: pkgconfig(libpq)
|
||||
BuildRequires: cmake(GTest)
|
||||
# Needed for documentation but we don't build it.
|
||||
# BuildRequires: dblatex
|
||||
# BuildRequires: doxygen
|
||||
@@ -90,8 +96,6 @@ Provides: bundled(arbiter)
|
||||
Provides: bundled(PoissonRecon)
|
||||
# https://github.com/jlblancoc/nanoflann bundled in vendor/nanoflann
|
||||
Provides: bundled(nanoflann)
|
||||
# https://github.com/nlohmann/json bundled in vendor/nlohmann
|
||||
Provides: bundled(nlohmann)
|
||||
%if 0%{?suse_version} < 1550
|
||||
BuildRequires: gcc12-c++
|
||||
%else
|
||||
@@ -165,12 +169,12 @@ PDAL algorithms.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{version}-src
|
||||
# Remove some bundled libraries to use system
|
||||
rm -rf vendor/{eigen,gtest}
|
||||
# Remove vendored eigen3 library
|
||||
rm -rf vendor/eigen
|
||||
# Fix all wrong shebang and move to python3 only
|
||||
find . -type f -iname "*.py" -exec sed -i 's,^#!%{_bindir}/env python$,#!%{_bindir}/python3,' {} +
|
||||
|
||||
#Cleanup spurious perms in documentation
|
||||
# Cleanup spurious perms in documentation
|
||||
find ./doc/ -type f -exec chmod -v 0644 {} +
|
||||
find ./doc/ -type f -iname "*.orig" -o -iname ".gitignore" -delete
|
||||
find ./doc/ -type f -iname "*.ai" -delete
|
||||
@@ -193,6 +197,8 @@ export CXX=g++-12
|
||||
-DENABLE_CTEST=ON \
|
||||
-Dgtest_build_tests=OFF \
|
||||
-DWITH_TESTS=ON \
|
||||
-DUSE_EXTERNAL_GTEST_DEFAULT=ON \
|
||||
-DUSE_EXTERNAL_GTEST=ON \
|
||||
-DWITH_COMPLETION=ON \
|
||||
-DWITH_LZMA=ON \
|
||||
-DPOSTGRESQL_INCLUDE_DIR=%{_includedir}/pgsql \
|
||||
@@ -271,7 +277,7 @@ sed -i 's,/usr//usr/lib64,%{_libdir},g' %{buildroot}/%{_libdir}/cmake/PDAL/PDALC
|
||||
|
||||
%files -n lib%{name}%{soname}
|
||||
%license LICENSE.txt
|
||||
%doc AUTHORS.txt README.md RELEASENOTES.txt
|
||||
%doc README.md
|
||||
%{_libdir}/libpdalcpp.so.%{soname}
|
||||
%{_libdir}/libpdalcpp.so.%{sovers}
|
||||
# Plugins
|
||||
@@ -289,7 +295,7 @@ sed -i 's,/usr//usr/lib64,%{_libdir},g' %{buildroot}/%{_libdir}/cmake/PDAL/PDALC
|
||||
|
||||
%files devel
|
||||
%license LICENSE.txt
|
||||
%doc AUTHORS.txt README.md CONTRIBUTING.md
|
||||
%doc README.md CONTRIBUTING.md
|
||||
%{_includedir}/pdal
|
||||
%{_libdir}/libpdalcpp.so
|
||||
%{_libdir}/libpdal_plugin_kernel_fauxplugin.so
|
||||
|
||||
@@ -1,200 +1,25 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e18fab718..98ecbd76e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -118,6 +118,9 @@ include(${PDAL_CMAKE_DIR}/lazperf.cmake)
|
||||
diff --git i/CMakeLists.txt w/CMakeLists.txt
|
||||
index 2a7a6c7e4..c2331d5b2 100644
|
||||
--- i/CMakeLists.txt
|
||||
+++ w/CMakeLists.txt
|
||||
@@ -119,6 +119,10 @@ include(${PDAL_CMAKE_DIR}/lazperf.cmake)
|
||||
include(${PDAL_CMAKE_DIR}/gcs.cmake) # Optional
|
||||
include(${PDAL_CMAKE_DIR}/utfcpp.cmake)
|
||||
|
||||
+find_package(PkgConfig REQUIRED)
|
||||
+PKG_CHECK_MODULES(EIGEN REQUIRED eigen3)
|
||||
+set(PDAL_VENDOR_EIGEN_DIR "${EIGEN_INCLUDE_DIRS}")
|
||||
+
|
||||
#------------------------------------------------------------------------------
|
||||
# generate the pdal_features.hpp header
|
||||
#------------------------------------------------------------------------------
|
||||
@@ -153,7 +156,6 @@ endif()
|
||||
add_subdirectory(plugins)
|
||||
diff --git i/cmake/directories.cmake w/cmake/directories.cmake
|
||||
index 97e799bdb..f079ec725 100644
|
||||
--- i/cmake/directories.cmake
|
||||
+++ w/cmake/directories.cmake
|
||||
@@ -11,5 +11,4 @@ set(PDAL_KERNELS_DIR ${ROOT_DIR}/kernels)
|
||||
set(PDAL_FILTERS_DIR ${ROOT_DIR}/filters)
|
||||
set(PDAL_IO_DIR ${ROOT_DIR}/io)
|
||||
set(PDAL_VENDOR_DIR ${ROOT_DIR}/vendor)
|
||||
-set(PDAL_VENDOR_EIGEN_DIR "${PDAL_VENDOR_DIR}/eigen")
|
||||
|
||||
if (WITH_TESTS)
|
||||
- include (${PDAL_CMAKE_DIR}/gtest.cmake)
|
||||
add_subdirectory(test)
|
||||
endif()
|
||||
add_subdirectory(dimbuilder)
|
||||
@@ -219,7 +221,7 @@ add_library(PDAL::PDAL ALIAS ${PDAL_LIB_NAME})
|
||||
#
|
||||
target_include_directories(${PDAL_LIB_NAME}
|
||||
SYSTEM BEFORE PRIVATE
|
||||
- ${PDAL_VENDOR_DIR}/eigen
|
||||
+ ${EIGEN_INCLUDE_DIRS}
|
||||
${PDAL_VENDOR_DIR}/kazhdan
|
||||
${PDAL_VENDOR_DIR}/h3/include
|
||||
)
|
||||
diff --git a/plugins/cpd/CMakeLists.txt b/plugins/cpd/CMakeLists.txt
|
||||
index ba85e27a7..dcf936502 100644
|
||||
--- a/plugins/cpd/CMakeLists.txt
|
||||
+++ b/plugins/cpd/CMakeLists.txt
|
||||
@@ -13,7 +13,7 @@ find_package(Fgt REQUIRED CONFIG)
|
||||
option(BUILD_PLUGIN_CPD "Build Coherent Point Drift support" ${Cpd_FOUND})
|
||||
|
||||
set(files filters/CpdFilter.cpp)
|
||||
-set(include_dirs "${CMAKE_CURRENT_LIST_DIR}" "${PDAL_VENDOR_DIR}/eigen")
|
||||
+set(include_dirs "${CMAKE_CURRENT_LIST_DIR}" "${EIGEN_INCLUDE_DIRS}")
|
||||
|
||||
PDAL_ADD_PLUGIN(filter_libname filter cpd
|
||||
FILES
|
||||
@@ -22,7 +22,7 @@ PDAL_ADD_PLUGIN(filter_libname filter cpd
|
||||
Cpd::Library-C++
|
||||
${PDAL_LIBRARIES}
|
||||
INCLUDES
|
||||
- ${PDAL_VENDOR_DIR}/eigen
|
||||
+ ${EIGEN_INCLUDE_DIRS}
|
||||
${CMAKE_CURRENT_LIST_DIR}
|
||||
)
|
||||
|
||||
diff --git a/plugins/rdb/CMakeLists.txt b/plugins/rdb/CMakeLists.txt
|
||||
index 0ddb9a24e..49a74a3e8 100644
|
||||
--- a/plugins/rdb/CMakeLists.txt
|
||||
+++ b/plugins/rdb/CMakeLists.txt
|
||||
@@ -25,7 +25,6 @@ PDAL_ADD_PLUGIN(libname reader rdb
|
||||
${RDB_INCLUDE_C_DIR}
|
||||
${PDAL_INCLUDE_DIRS}
|
||||
)
|
||||
-target_include_directories(${libname} PRIVATE "${PDAL_VENDOR_DIR}/eigen")
|
||||
target_include_directories(${libname} PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../../vendor/nlohmann/")
|
||||
target_include_directories(${libname} PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../../vendor/eigen/")
|
||||
|
||||
@@ -54,7 +53,7 @@ if (BUILD_RDBLIB_TESTS)
|
||||
${PROJECT_SOURCE_DIR}/plugins/rdb/io
|
||||
${RDB_INCLUDE_CPP_DIR}
|
||||
${RDB_INCLUDE_C_DIR}
|
||||
- ${PDAL_VENDOR_DIR}/eigen
|
||||
+ ${EIGEN_INCLUDE_DIRS}
|
||||
|
||||
)
|
||||
endif()
|
||||
diff --git a/plugins/teaser/CMakeLists.txt b/plugins/teaser/CMakeLists.txt
|
||||
index cb1cb0e4e..c4017cab8 100644
|
||||
--- a/plugins/teaser/CMakeLists.txt
|
||||
+++ b/plugins/teaser/CMakeLists.txt
|
||||
@@ -67,6 +67,6 @@ if (WITH_TESTS)
|
||||
LINK_WITH
|
||||
${filter_libname}
|
||||
INCLUDES
|
||||
- "${PDAL_VENDOR_DIR}/eigen"
|
||||
+ ${EIGEN_INCLUDE_DIRS}
|
||||
)
|
||||
endif()
|
||||
diff --git a/plugins/trajectory/CMakeLists.txt b/plugins/trajectory/CMakeLists.txt
|
||||
index 31fc9942f..6ec207d95 100644
|
||||
--- a/plugins/trajectory/CMakeLists.txt
|
||||
+++ b/plugins/trajectory/CMakeLists.txt
|
||||
@@ -18,7 +18,7 @@ PDAL_ADD_PLUGIN(libname filter trajectory
|
||||
${CERES_LIBRARIES}
|
||||
${PDAL_LIBRARIES}
|
||||
INCLUDES
|
||||
- ${PDAL_VENDOR_DIR}/eigen
|
||||
+ ${EIGEN_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
if (WITH_TRAJECTORY_TEST)
|
||||
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
|
||||
index 7ac5a1ede..a7e3bedd2 100644
|
||||
--- a/test/unit/CMakeLists.txt
|
||||
+++ b/test/unit/CMakeLists.txt
|
||||
@@ -34,7 +34,7 @@ PDAL_ADD_TEST(pdal_eigen_test
|
||||
${PDAL_SRC_DIR}/private/MathUtils.cpp
|
||||
|
||||
INCLUDES
|
||||
- ${PDAL_VENDOR_DIR}/eigen
|
||||
+ ${EIGEN_INCLUDE_DIRS}
|
||||
)
|
||||
PDAL_ADD_TEST(pdal_file_utils_test FILES FileUtilsTest.cpp)
|
||||
PDAL_ADD_TEST(pdal_georeference_test FILES GeoreferenceTest.cpp)
|
||||
@@ -43,7 +43,7 @@ PDAL_ADD_TEST(pdal_kdindex_test
|
||||
KDIndexTest.cpp
|
||||
INCLUDES
|
||||
${PDAL_VENDOR_DIR}
|
||||
- ${PDAL_VENDOR_DIR}/eigen
|
||||
+ ${EIGEN_INCLUDE_DIRS}
|
||||
)
|
||||
PDAL_ADD_TEST(pdal_kernel_test FILES KernelTest.cpp)
|
||||
PDAL_ADD_TEST(pdal_log_test FILES LogTest.cpp)
|
||||
@@ -52,7 +52,7 @@ PDAL_ADD_TEST(pdal_math_utils_test
|
||||
MathUtilsTest.cpp
|
||||
${PDAL_SRC_DIR}/private/MathUtils.cpp
|
||||
INCLUDES
|
||||
- ${PDAL_VENDOR_DIR}/eigen
|
||||
+ ${EIGEN_INCLUDE_DIRS}
|
||||
)
|
||||
PDAL_ADD_TEST(pdal_metadata_test FILES MetadataTest.cpp)
|
||||
PDAL_ADD_TEST(pdal_oldpclblock_test FILES OldPCLBlockTest.cpp)
|
||||
@@ -84,7 +84,7 @@ PDAL_ADD_TEST(pdal_point_view_test
|
||||
FILES
|
||||
PointViewTest.cpp
|
||||
INCLUDES
|
||||
- ${PDAL_VENDOR_DIR}/eigen
|
||||
+ ${EIGEN_INCLUDE_DIRS}
|
||||
)
|
||||
PDAL_ADD_TEST(pdal_point_table_test FILES PointTableTest.cpp)
|
||||
|
||||
@@ -227,13 +227,13 @@ PDAL_ADD_TEST(pdal_io_pcd_reader_test
|
||||
FILES
|
||||
io/PcdReaderTest.cpp
|
||||
INCLUDES
|
||||
- ${PDAL_VENDOR_DIR}/eigen
|
||||
+ ${EIGEN_INCLUDE_DIRS}
|
||||
)
|
||||
PDAL_ADD_TEST(pdal_io_pcd_writer_test
|
||||
FILES
|
||||
io/PcdWriterTest.cpp
|
||||
INCLUDES
|
||||
- ${PDAL_VENDOR_DIR}/eigen
|
||||
+ ${EIGEN_INCLUDE_DIRS}
|
||||
)
|
||||
PDAL_ADD_TEST(pdal_io_ply_reader_test
|
||||
FILES
|
||||
@@ -279,7 +279,7 @@ PDAL_ADD_TEST(pdal_i3s_obb_test
|
||||
INCLUDES
|
||||
${NLOHMANN_INCLUDE_DIR}
|
||||
${PDAL_INCLUDE_DIR}
|
||||
- ${PDAL_VENDOR_DIR}/eigen
|
||||
+ ${EIGEN_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
if (BUILD_I3S_TESTS)
|
||||
@@ -300,7 +300,7 @@ PDAL_ADD_TEST(pdal_filters_chipper_test
|
||||
filters/ChipperTest.cpp
|
||||
INCLUDES
|
||||
${NLOHMANN_INCLUDE_DIR}
|
||||
- ${PDAL_VENDOR_DIR}/eigen
|
||||
+ ${EIGEN_INCLUDE_DIRS}
|
||||
)
|
||||
PDAL_ADD_TEST(pdal_filters_nndistance_test
|
||||
FILES
|
||||
@@ -359,7 +359,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test
|
||||
FILES
|
||||
filters/IcpFilterTest.cpp
|
||||
INCLUDES
|
||||
- ${PDAL_VENDOR_DIR}/eigen
|
||||
+ ${EIGEN_INCLUDE_DIRS}
|
||||
)
|
||||
PDAL_ADD_TEST(pdal_filters_info_test FILES filters/InfoFilterTest.cpp)
|
||||
PDAL_ADD_TEST(pdal_filters_lloydkmeans_test FILES filters/LloydKMeansFilterTest.cpp)
|
||||
@@ -380,7 +380,7 @@ PDAL_ADD_TEST(pdal_filters_planefit_test
|
||||
FILES
|
||||
filters/PlaneFitFilterTest.cpp
|
||||
INCLUDES
|
||||
- ${PDAL_VENDOR_DIR}/eigen)
|
||||
+ ${EIGEN_INCLUDE_DIRS})
|
||||
PDAL_ADD_TEST(pdal_filters_pmf_test FILES filters/PMFFilterTest.cpp)
|
||||
PDAL_ADD_TEST(pdal_filters_reprojection_test FILES
|
||||
filters/ReprojectionFilterTest.cpp)
|
||||
@@ -408,7 +408,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test
|
||||
FILES
|
||||
filters/SplitterTest.cpp
|
||||
INCLUDES
|
||||
- ${PDAL_VENDOR_DIR}/eigen)
|
||||
+ ${EIGEN_INCLUDE_DIRS})
|
||||
PDAL_ADD_TEST(pdal_filters_stats_test FILES filters/StatsFilterTest.cpp)
|
||||
PDAL_ADD_TEST(pdal_filters_transformation_test FILES
|
||||
filters/TransformationFilterTest.cpp)
|
||||
|
||||
Reference in New Issue
Block a user