pcl: update patches

recipes/pcl/all/conandata.yml

@@ -7,30 +7,26 @@ sources:
     sha256: "8ab98a9db371d822de0859084a375a74bdc7f31c96d674147710cf4101b79621"
 patches:
   "1.14.0":
-    - patch_file: "patches/0001-cmake_use_conan_targets.patch"
+    - patch_file: "patches/1.14.0/0001-cmake_use_conan_targets.patch"
       patch_description: "Update PCL CMake files to work with Conan"
       patch_type: "conan"
-    - patch_file: "patches/0001-fix-FindOpenNI-bug.patch"
+    - patch_file: "patches/1.13.1/0001-fix-FindOpenNI-bug.patch"
       patch_description: "Fix a libusb detection bug in FindOpenNI.cmake"
       patch_type: "bugfix"
-    - patch_file: "patches/0001-Add-Eigen3-Eigen-target-in-pcl_common-target.patch"
+    - patch_file: "patches/1.13.1/0001-Add-Eigen3-Eigen-target-in-pcl_common-target.patch"
       patch_description: "Add Eigen3::Eigen target to pcl_common target"
       patch_type: "conan"
-    - patch_file: "patches/0001-ReportFixAboutMemoryConsumptionDuringBuild.patch"
-      patch_description: "MovingLeastSquares: reduce the number of instantiations to reduce compile time"
-      patch_source: "https://github.com/PointCloudLibrary/pcl/pull/5764"
-      patch_type: "conan"
   "1.13.1":
-    - patch_file: "patches/0001-cmake_use_conan_targets.patch"
+    - patch_file: "patches/1.13.1/0001-cmake_use_conan_targets.patch"
       patch_description: "Update PCL CMake files to work with Conan"
       patch_type: "conan"
-    - patch_file: "patches/0001-fix-FindOpenNI-bug.patch"
+    - patch_file: "patches/1.13.1/0001-fix-FindOpenNI-bug.patch"
       patch_description: "Fix a libusb detection bug in FindOpenNI.cmake"
       patch_type: "bugfix"
-    - patch_file: "patches/0001-Add-Eigen3-Eigen-target-in-pcl_common-target.patch"
+    - patch_file: "patches/1.13.1/0001-Add-Eigen3-Eigen-target-in-pcl_common-target.patch"
       patch_description: "Add Eigen3::Eigen target to pcl_common target"
       patch_type: "conan"
-    - patch_file: "patches/0001-ReportFixAboutMemoryConsumptionDuringBuild.patch"
+    - patch_file: "patches/1.13.1/0001-ReportFixAboutMemoryConsumptionDuringBuild.patch"
       patch_description: "MovingLeastSquares: reduce the number of instantiations to reduce compile time"
       patch_source: "https://github.com/PointCloudLibrary/pcl/pull/5764"
       patch_type: "conan"

recipes/pcl/all/conanfile.py

@@ -467,6 +467,7 @@ def generate(self):
         # The default False setting breaks OpenGL detection in CMake
         tc.variables["PCL_ALLOW_BOTH_SHARED_AND_STATIC_DEPENDENCIES"] = True
         tc.variables["OpenGL_GL_PREFERENCE"] = "GLVND"
+        tc.variables["EIGEN3_FOUND"] = True
 
         if not self.options.add_build_type_postfix:
             tc.variables["CMAKE_DEBUG_POSTFIX"] = ""

recipes/pcl/all/patches/1.14.0/0001-cmake_use_conan_targets.patch

@@ -0,0 +1,38 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -297,7 +297,7 @@
+ # OpenMP (optional)
+ option(WITH_OPENMP "Build with parallelization using OpenMP" TRUE)
+ if(WITH_OPENMP)
+-  find_package(OpenMP COMPONENTS C CXX)
++  find_package(OpenMP REQUIRED COMPONENTS C CXX)
+ endif()
+ if(OpenMP_FOUND)
+   string(APPEND CMAKE_C_FLAGS " ${OpenMP_C_FLAGS}")
+@@ -365,7 +365,7 @@
+ # LibPNG
+ option(WITH_PNG "PNG file support" TRUE)
+ if(WITH_PNG)
+-  find_package(PNG)
++  find_package(PNG REQUIRED CONFIG)
+   if(PNG_FOUND)
+     set(HAVE_PNG ON)
+     include_directories(SYSTEM "${PNG_INCLUDE_DIR}")
+@@ -375,7 +375,7 @@
+ # Qhull
+ option(WITH_QHULL "Include convex-hull operations" TRUE)
+ if(WITH_QHULL)
+-  find_package(Qhull)
++  find_package(QHULL REQUIRED CONFIG)
+   if(NOT (${QHULL_LIBRARY_TYPE} MATCHES ${PCL_QHULL_REQUIRED_TYPE}) AND NOT (${PCL_QHULL_REQUIRED_TYPE} MATCHES "DONTCARE"))
+     message(FATAL_ERROR "Qhull was selected with ${PCL_QHULL_REQUIRED_TYPE} but found as ${QHULL_LIBRARY_TYPE}")
+   endif()
+@@ -410,7 +410,7 @@
+ #Find PCAP
+ option(WITH_PCAP "pcap file capabilities in Velodyne HDL driver" TRUE)
+ if(WITH_PCAP)
+-  find_package(Pcap)
++  find_package(PCAP REQUIRED CONFIG)
+ endif()
+
+ # OpenGL and GLUT