From 2ded45cc7a35667ad8d96e5e50b4a24afacafb3a Mon Sep 17 00:00:00 2001
From: Jack Jansen <Jack.Jansen@cwi.nl>
Date: Sat, 1 Feb 2025 08:25:33 +0100
Subject: [PATCH] [pcl] Fix pcl build when building for arm/arm64 (#43295)

---
 ports/pcl/portfile.cmake | 5 +++++
 ports/pcl/vcpkg.json     | 2 +-
 scripts/ci.baseline.txt  | 2 --
 versions/baseline.json   | 2 +-
 versions/p-/pcl.json     | 5 +++++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake
index 5c310395f4..06e89e8712 100644
--- a/ports/pcl/portfile.cmake
+++ b/ports/pcl/portfile.cmake
@@ -20,6 +20,10 @@ vcpkg_from_github(
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS)
 
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+	set(PCL_DONT_TRY_SSE "-DPCL_ENABLE_SSE=OFF")
+endif()
+
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         apps            BUILD_apps
@@ -52,6 +56,7 @@ vcpkg_cmake_configure(
         -DPCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS}
         -DPCL_SHARED_LIBS=${PCL_SHARED_LIBS}
         -DPCL_ENABLE_MARCHNATIVE=OFF
+        ${PCL_DONT_TRY_SSE}
         # WITH
         -DWITH_DAVIDSDK=OFF
         -DWITH_DOCS=OFF
diff --git a/ports/pcl/vcpkg.json b/ports/pcl/vcpkg.json
index 7fe2f3151f..77ab51cf42 100644
--- a/ports/pcl/vcpkg.json
+++ b/ports/pcl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "pcl",
   "version": "1.14.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.",
   "homepage": "https://github.com/PointCloudLibrary/pcl",
   "license": "BSD-3-Clause",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 8f4ef316a6..a70c5866a8 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -864,8 +864,6 @@ paho-mqtt:x64-uwp=fail
 pango:arm-neon-android=fail
 pango:arm64-android=fail
 pango:x64-android=fail
-pcl:arm-neon-android=fail
-pcl:arm64-android=fail
 pcl:x64-android=fail
 pdal:arm-neon-android=fail
 pdal:arm64-android=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index 23a25e0f60..49d680ff03 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6950,7 +6950,7 @@
     },
     "pcl": {
       "baseline": "1.14.1",
-      "port-version": 3
+      "port-version": 4
     },
     "pcre": {
       "baseline": "8.45",
diff --git a/versions/p-/pcl.json b/versions/p-/pcl.json
index affe46029e..d2cdb4344b 100644
--- a/versions/p-/pcl.json
+++ b/versions/p-/pcl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8334f3e6c6b3f1f5cf70c8dc6b737eccb33ed326",
+      "version": "1.14.1",
+      "port-version": 4
+    },
     {
       "git-tree": "57795e21c0c37576db6bfb1df3b134de461d10e0",
       "version": "1.14.1",