PDAL_unbundle.patch 7.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191
  1. diff -rupN --no-dereference PDAL-2.4.2-src/CMakeLists.txt PDAL-2.4.2-src-new/CMakeLists.txt
  2. --- PDAL-2.4.2-src/CMakeLists.txt 2022-06-06 20:04:04.000000000 +0200
  3. +++ PDAL-2.4.2-src-new/CMakeLists.txt 2022-06-07 08:49:13.992039438 +0200
  4. @@ -138,6 +138,9 @@ include(${PDAL_CMAKE_DIR}/nlohmann.cmake
  5. include(${PDAL_CMAKE_DIR}/lazperf.cmake)
  6. include(${PDAL_CMAKE_DIR}/openssl.cmake) # Optional
  7. +find_package(PkgConfig REQUIRED)
  8. +PKG_CHECK_MODULES(EIGEN REQUIRED eigen3)
  9. +
  10. #------------------------------------------------------------------------------
  11. # generate the pdal_features.hpp header
  12. #------------------------------------------------------------------------------
  13. @@ -173,7 +176,6 @@ endif()
  14. add_subdirectory(plugins)
  15. if (WITH_TESTS)
  16. - include (${PDAL_CMAKE_DIR}/gtest.cmake)
  17. add_subdirectory(test)
  18. endif()
  19. add_subdirectory(dimbuilder)
  20. @@ -254,11 +256,11 @@ target_include_directories(${PDAL_BASE_L
  21. ${ROOT_DIR}
  22. ${PROJECT_BINARY_DIR}/include
  23. ${PDAL_VENDOR_DIR}
  24. - ${PDAL_VENDOR_DIR}/eigen
  25. ${LIBXML2_INCLUDE_DIR}
  26. ${ZSTD_INCLUDE_DIRS}
  27. ${NLOHMANN_INCLUDE_DIR}
  28. ${GDAL_INCLUDE_DIR}
  29. + ${EIGEN_INCLUDE_DIRS}
  30. )
  31. target_link_libraries(${PDAL_BASE_LIB_NAME}
  32. PRIVATE
  33. diff -rupN --no-dereference PDAL-2.4.2-src/plugins/cpd/CMakeLists.txt PDAL-2.4.2-src-new/plugins/cpd/CMakeLists.txt
  34. --- PDAL-2.4.2-src/plugins/cpd/CMakeLists.txt 2022-06-06 20:04:01.000000000 +0200
  35. +++ PDAL-2.4.2-src-new/plugins/cpd/CMakeLists.txt 2022-06-07 08:49:13.992039438 +0200
  36. @@ -4,7 +4,7 @@ find_package(Cpd ${Cpd_VERSION} REQUIRED
  37. option(BUILD_PLUGIN_CPD "Build Coherent Point Drift support" ${Cpd_FOUND})
  38. set(files filters/CpdFilter.cpp)
  39. -set(include_dirs "${CMAKE_CURRENT_LIST_DIR}" "${PDAL_VENDOR_DIR}/eigen")
  40. +set(include_dirs "${CMAKE_CURRENT_LIST_DIR}" "${EIGEN_INCLUDE_DIRS}")
  41. PDAL_ADD_PLUGIN(filter_libname filter cpd
  42. FILES
  43. diff -rupN --no-dereference PDAL-2.4.2-src/plugins/i3s/CMakeLists.txt PDAL-2.4.2-src-new/plugins/i3s/CMakeLists.txt
  44. --- PDAL-2.4.2-src/plugins/i3s/CMakeLists.txt 2022-06-06 20:04:01.000000000 +0200
  45. +++ PDAL-2.4.2-src-new/plugins/i3s/CMakeLists.txt 2022-06-07 08:49:13.992039438 +0200
  46. @@ -20,7 +20,7 @@ PDAL_ADD_PLUGIN(i3s_reader_libname reade
  47. INCLUDES
  48. ${NLOHMANN_INCLUDE_DIR}
  49. ${PDAL_VENDOR_DIR}
  50. - ${PDAL_VENDOR_DIR}/eigen
  51. + ${EIGEN_INCLUDE_DIRS}
  52. )
  53. target_compile_definitions(${i3s_reader_libname}
  54. PRIVATE
  55. @@ -41,7 +41,7 @@ PDAL_ADD_PLUGIN(slpk_reader_libname read
  56. INCLUDES
  57. ${NLOHMANN_INCLUDE_DIR}
  58. ${PDAL_VENDOR_DIR}
  59. - ${PDAL_VENDOR_DIR}/eigen
  60. + ${EIGEN_INCLUDE_DIRS}
  61. )
  62. target_compile_definitions(${slpk_reader_libname}
  63. PRIVATE
  64. @@ -61,7 +61,7 @@ if (WITH_TESTS)
  65. ${PDAL_SRC_DIR}/private/MathUtils.cpp
  66. INCLUDES
  67. ${NLOHMANN_INCLUDE_DIR}
  68. - ${PDAL_VENDOR_DIR}/eigen
  69. + ${EIGEN_INCLUDE_DIRS}
  70. )
  71. if (BUILD_I3S_TESTS)
  72. diff -rupN --no-dereference PDAL-2.4.2-src/plugins/rdb/CMakeLists.txt PDAL-2.4.2-src-new/plugins/rdb/CMakeLists.txt
  73. --- PDAL-2.4.2-src/plugins/rdb/CMakeLists.txt 2022-06-06 20:04:01.000000000 +0200
  74. +++ PDAL-2.4.2-src-new/plugins/rdb/CMakeLists.txt 2022-06-07 08:49:13.992039438 +0200
  75. @@ -27,7 +27,7 @@ PDAL_ADD_PLUGIN(libname reader rdb
  76. ${RDB_INCLUDE_CPP_DIR}
  77. ${PDAL_INCLUDE_DIRS}
  78. )
  79. -target_include_directories(${libname} PRIVATE "${PDAL_VENDOR_DIR}/eigen")
  80. +target_include_directories(${libname} PRIVATE "${EIGEN_INCLUDE_DIRS}")
  81. target_include_directories(${libname} PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../../vendor/nlohmann/")
  82. target_include_directories(${libname} PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../../vendor/eigen/")
  83. @@ -55,7 +55,7 @@ if (BUILD_RDBLIB_TESTS)
  84. ${PROJECT_BINARY_DIR}/plugins/rdb/test
  85. ${PROJECT_SOURCE_DIR}/plugins/rdb/io
  86. ${RDB_INCLUDE_CPP_DIR}
  87. - ${PDAL_VENDOR_DIR}/eigen
  88. + ${EIGEN_INCLUDE_DIRS}
  89. )
  90. endif()
  91. diff -rupN --no-dereference PDAL-2.4.2-src/plugins/teaser/CMakeLists.txt PDAL-2.4.2-src-new/plugins/teaser/CMakeLists.txt
  92. --- PDAL-2.4.2-src/plugins/teaser/CMakeLists.txt 2022-06-06 20:04:01.000000000 +0200
  93. +++ PDAL-2.4.2-src-new/plugins/teaser/CMakeLists.txt 2022-06-07 08:49:13.992039438 +0200
  94. @@ -63,6 +63,6 @@ if (WITH_TESTS)
  95. LINK_WITH
  96. ${filter_libname}
  97. INCLUDES
  98. - "${PDAL_VENDOR_DIR}/eigen"
  99. + "${EIGEN_INCLUDE_DIRS}"
  100. )
  101. endif()
  102. diff -rupN --no-dereference PDAL-2.4.2-src/test/unit/CMakeLists.txt PDAL-2.4.2-src-new/test/unit/CMakeLists.txt
  103. --- PDAL-2.4.2-src/test/unit/CMakeLists.txt 2022-06-06 20:04:02.000000000 +0200
  104. +++ PDAL-2.4.2-src-new/test/unit/CMakeLists.txt 2022-06-07 08:49:13.993039438 +0200
  105. @@ -34,7 +34,7 @@ PDAL_ADD_TEST(pdal_eigen_test
  106. ${PDAL_SRC_DIR}/private/MathUtils.cpp
  107. INCLUDES
  108. - ${PDAL_VENDOR_DIR}/eigen
  109. + ${EIGEN_INCLUDE_DIRS}
  110. )
  111. PDAL_ADD_TEST(pdal_file_utils_test FILES FileUtilsTest.cpp)
  112. PDAL_ADD_TEST(pdal_georeference_test FILES GeoreferenceTest.cpp)
  113. @@ -43,7 +43,7 @@ PDAL_ADD_TEST(pdal_kdindex_test
  114. KDIndexTest.cpp
  115. INCLUDES
  116. ${PDAL_VENDOR_DIR}
  117. - ${PDAL_VENDOR_DIR}/eigen
  118. + ${EIGEN_INCLUDE_DIRS}
  119. )
  120. PDAL_ADD_TEST(pdal_kernel_test FILES KernelTest.cpp)
  121. PDAL_ADD_TEST(pdal_log_test FILES LogTest.cpp)
  122. @@ -70,7 +70,7 @@ PDAL_ADD_TEST(pdal_point_view_test
  123. FILES
  124. PointViewTest.cpp
  125. INCLUDES
  126. - ${PDAL_VENDOR_DIR}/eigen
  127. + ${EIGEN_INCLUDE_DIRS}
  128. )
  129. PDAL_ADD_TEST(pdal_point_table_test FILES PointTableTest.cpp)
  130. @@ -190,13 +190,13 @@ PDAL_ADD_TEST(pdal_io_pcd_reader_test
  131. FILES
  132. io/PcdReaderTest.cpp
  133. INCLUDES
  134. - ${PDAL_VENDOR_DIR}/eigen
  135. + ${EIGEN_INCLUDE_DIRS}
  136. )
  137. PDAL_ADD_TEST(pdal_io_pcd_writer_test
  138. FILES
  139. io/PcdWriterTest.cpp
  140. INCLUDES
  141. - ${PDAL_VENDOR_DIR}/eigen
  142. + ${EIGEN_INCLUDE_DIRS}
  143. )
  144. PDAL_ADD_TEST(pdal_io_ply_reader_test
  145. FILES
  146. @@ -233,7 +233,7 @@ PDAL_ADD_TEST(pdal_filters_chipper_test
  147. filters/ChipperTest.cpp
  148. INCLUDES
  149. ${NLOHMANN_INCLUDE_DIR}
  150. - ${PDAL_VENDOR_DIR}/eigen
  151. + ${EIGEN_INCLUDE_DIRS}
  152. )
  153. PDAL_ADD_TEST(pdal_filters_nndistance_test
  154. FILES
  155. @@ -284,7 +284,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test
  156. FILES
  157. filters/IcpFilterTest.cpp
  158. INCLUDES
  159. - ${PDAL_VENDOR_DIR}/eigen
  160. + ${EIGEN_INCLUDE_DIRS}
  161. )
  162. PDAL_ADD_TEST(pdal_filters_info_test FILES filters/InfoFilterTest.cpp)
  163. PDAL_ADD_TEST(pdal_filters_lloydkmeans_test FILES filters/LloydKMeansFilterTest.cpp)
  164. @@ -305,7 +305,7 @@ PDAL_ADD_TEST(pdal_filters_planefit_test
  165. FILES
  166. filters/PlaneFitFilterTest.cpp
  167. INCLUDES
  168. - ${PDAL_VENDOR_DIR}/eigen)
  169. + ${EIGEN_INCLUDE_DIRS})
  170. PDAL_ADD_TEST(pdal_filters_pmf_test FILES filters/PMFFilterTest.cpp)
  171. PDAL_ADD_TEST(pdal_filters_reprojection_test FILES
  172. filters/ReprojectionFilterTest.cpp)
  173. @@ -330,7 +330,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test
  174. FILES
  175. filters/SplitterTest.cpp
  176. INCLUDES
  177. - ${PDAL_VENDOR_DIR}/eigen)
  178. + ${EIGEN_INCLUDE_DIRS})
  179. PDAL_ADD_TEST(pdal_filters_stats_test FILES filters/StatsFilterTest.cpp)
  180. PDAL_ADD_TEST(pdal_filters_transformation_test FILES
  181. filters/TransformationFilterTest.cpp)