Add pcl 1.15.1

Author: EstebanDugueperoux2

recipes/pcl/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "1.15.1":
+    url: https://github.com/PointCloudLibrary/pcl/archive/0dec791a676b23581f111c9d50ed3b375d3c8868.zip
+    sha256: ba578a7355121cd6eb176e095483b3c9356d7554c834599e2c31cfd017948847
   "1.13.1":
     url: https://github.com/PointCloudLibrary/pcl/archive/refs/tags/pcl-1.13.1.tar.gz
     sha256: 8ab98a9db371d822de0859084a375a74bdc7f31c96d674147710cf4101b79621

recipes/pcl/all/conanfile.py

@@ -65,6 +65,7 @@ class PclConan(ConanFile):
         "tools": [True, False],
         # Optional external dependencies.
         # Only used if the corresponding component is enabled.
+        "with_cjson": [True, False],
         "with_cuda": [True, False],
         "with_flann": [True, False],
         "with_libusb": [True, False],
@@ -106,8 +107,8 @@ class PclConan(ConanFile):
         "keypoints": True,
         "ml": True,
         "octree": True,
-        "outofcore": False,
-        "people": False,
+        "outofcore": True,
+        "people": True,
         "recognition": True,
         "registration": True,
         "sample_consensus": True,
@@ -138,6 +139,7 @@ class PclConan(ConanFile):
         "apps": False,
         "tools": False,
         # Optional external dependencies
+        "with_cjson": True,
         "with_cuda": False,
         "with_flann": True,
         "with_libusb": True,
@@ -205,6 +207,7 @@ def _ext_dep_to_conan_target(self, dep):
             return []
         return {
             "boost": ["boost::boost"],
+            "cjson": ["cjson::cjson"] if Version(self.version) >= "1.15" else [],
             "cuda": [],
             "davidsdk": [],
             "dssdk": [],
@@ -337,6 +340,10 @@ def config_options(self):
             del self.options.fPIC
         if self.settings.arch not in ["x86", "x86_64"]:
             del self.options.use_sse
+        if Version(self.version) < "1.15":
+            del self.options.with_cjson
+            self.options.outofcore = False
+            self.options.people = False
 
     def configure(self):
         if self.options.shared:
@@ -366,6 +373,9 @@ def _is_enabled(self, dep):
         return is_available and is_used
 
     def requirements(self):
+        # Boost 1.87 not usable because of deprecations 
+        # See https://www.boost.org/doc/libs/1_85_0/libs/filesystem/doc/deprecated.html
+        # See https://github.com/PointCloudLibrary/pcl/issues/5881
         self.requires("boost/1.83.0", transitive_headers=True)
         self.requires("eigen/3.4.0", transitive_headers=True)
         if self._is_enabled("flann"):
@@ -375,11 +385,11 @@ def requirements(self):
         if self._is_enabled("qhull"):
             self.requires("qhull/8.0.1", transitive_headers=True)
         if self._is_enabled("qt"):
-            self.requires("qt/6.6.1")
+            self.requires("qt/6.7.3")
         if self._is_enabled("libusb"):
             self.requires("libusb/1.0.26", transitive_headers=True)
         if self._is_enabled("pcap"):
-            self.requires("libpcap/1.10.4")
+            self.requires("libpcap/1.10.5")
         if self._is_enabled("opengl"):
             # OpenGL is only used if VTK is available
             self.requires("opengl/system", transitive_headers=True)
@@ -390,9 +400,11 @@ def requirements(self):
             else:
                 self.requires("mesa-glu/9.0.3", transitive_headers=True)
         if self._is_enabled("opencv"):
-            self.requires("opencv/4.8.1", transitive_headers=True)
+            self.requires("opencv/4.11.0", transitive_headers=True)
         if self._is_enabled("zlib"):
             self.requires("zlib/[>=1.2.11 <2]")
+        if self._is_enabled("cjson"):
+            self.requires("cjson/[~1]", transitive_headers=True)
         # TODO:
         # self.requires("vtk/9.x.x", transitive_headers=True)
         # self.requires("openni/x.x.x", transitive_headers=True)
@@ -464,7 +476,7 @@ def generate(self):
         tc.variables["OpenGL_GL_PREFERENCE"] = "GLVND"
 
         if not self.options.add_build_type_postfix:
-            tc.cache_variables["CMAKE_DEBUG_POSTFIX"] = ""
+            tc.cache_variables["CMAKE_DEBUG_POSTFIX"] = ""  
             tc.cache_variables["CMAKE_RELEASE_POSTFIX"] = ""
             tc.cache_variables["CMAKE_RELWITHDEBINFO_POSTFIX"] = ""
             tc.cache_variables["CMAKE_MINSIZEREL_POSTFIX"] = ""
@@ -486,7 +498,13 @@ def generate(self):
         tc.generate()
 
         deps = CMakeDeps(self)
-        deps.set_property("eigen", "cmake_file_name", "EIGEN")
+
+        if Version(self.version) < "1.15":
+            deps.set_property("eigen", "cmake_file_name", "EIGEN")
+        else:
+            deps.set_property("eigen", "cmake_file_name", "Eigen3")
+            deps.set_property("cjson", "cmake_target_name", "cJSON::cJSON")
+
         deps.set_property("flann", "cmake_file_name", "FLANN")
         deps.set_property("flann", "cmake_target_name", "FLANN::FLANN")
         deps.set_property("libpcap", "cmake_file_name", "PCAP")
@@ -499,7 +517,10 @@ def generate(self):
 
     def _patch_sources(self):
         apply_conandata_patches(self)
-        for mod in ["Eigen", "FLANN", "GLEW", "Pcap", "Qhull", "libusb"]:
+        mods = ["FLANN", "Pcap", "Qhull", "libusb"]
+        if Version(self.version) < "1.15":
+            mods.extend(["Eigen", "GLEW"])
+        for mod in mods:
             os.remove(os.path.join(self.source_folder, "cmake", "Modules", f"Find{mod}.cmake"))
 
     def build(self):