[pcl] update pcl to 1.12.0

ports/pcl/fix-find-qhull.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2c50b8d..c5bdf35 100644
+index 63b38df68..07caa29aa 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -354,10 +354,7 @@ if(WITH_QHULL)
+@@ -355,10 +355,7 @@ if(WITH_QHULL)
    if(NOT PCL_SHARED_LIBS OR ((WIN32 AND NOT MINGW) AND NOT PCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32))
      set(QHULL_USE_STATIC ON)
    endif()
@@ -15,7 +15,7 @@ index 2c50b8d..c5bdf35 100644
 
  # Cuda
 diff --git a/surface/CMakeLists.txt b/surface/CMakeLists.txt
-index e5e4231..2fb8a46 100644
+index d8a8566ea..1953c5566 100644
 --- a/surface/CMakeLists.txt
 +++ b/surface/CMakeLists.txt
 @@ -12,7 +12,7 @@ if(NOT build)
@@ -27,10 +27,10 @@ index e5e4231..2fb8a46 100644
    set(HULL_INCLUDES
      "include/pcl/${SUBSYS_NAME}/concave_hull.h"
      "include/pcl/${SUBSYS_NAME}/convex_hull.h"
-@@ -159,7 +159,12 @@ include_directories(SYSTEM
- link_directories(${VTK_LIBRARY_DIRS})
- PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs} ${VTK_SMOOTHING_INCLUDES} ${POISSON_INCLUDES} ${OPENNURBS_INCLUDES} ${ON_NURBS_INCLUDES})
- target_link_libraries("${LIB_NAME}" pcl_common pcl_search pcl_kdtree pcl_octree ${VTK_LIBRARIES} ${ON_NURBS_LIBRARIES})
+@@ -186,7 +186,12 @@ if(VTK_FOUND)
+   endif()
+ endif()
+
 -if(QHULL_FOUND)
 +if(Qhull_FOUND)
 +  if(QHULL_USE_STATIC)
@@ -40,4 +40,4 @@ index e5e4231..2fb8a46 100644
 +  endif()
    target_link_libraries("${LIB_NAME}" ${QHULL_LIBRARIES})
  endif()
- PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS})
+

ports/pcl/fix-link-libpng.patch

@@ -1,20 +1,38 @@
+From 837e7a9d9388d65ac927f3e1b837a28b56bb25c8 Mon Sep 17 00:00:00 2001
+From: Wenquan Duan <1784104469@qq.com>
+Date: Wed, 27 Oct 2021 02:00:33 +0800
+Subject: [PATCH] CMakeLists.txt
+
+---
+ io/CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
 diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt
-index f234971..86ea242 100644
+index ab918424e..0de0ad2e2 100644
 --- a/io/CMakeLists.txt
 +++ b/io/CMakeLists.txt
-@@ -333,12 +333,13 @@ set(LIB_NAME "pcl_${SUBSYS_NAME}")
- add_definitions(${VTK_DEFINES})
- PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${compression_incs} ${impl_incs} ${OPENNI_INCLUDES} ${OPENNI2_INCLUDES})
+@@ -338,6 +338,10 @@ PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${c
+
  target_include_directories(${LIB_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
--link_directories(${VTK_LINK_DIRECTORIES})
--target_link_libraries("${LIB_NAME}" pcl_common pcl_io_ply ${VTK_LIBRARIES})
- if(PNG_FOUND)
-   target_link_libraries("${LIB_NAME}" ${PNG_LIBRARIES})
- endif()
 
-+link_directories(${VTK_LINK_DIRECTORIES})
-+target_link_libraries("${LIB_NAME}" pcl_common pcl_io_ply ${VTK_LIBRARIES})
++if(PNG_FOUND)
++  target_link_libraries("${LIB_NAME}" ${PNG_LIBRARIES})
++endif()
 +
- if(LIBUSB_1_FOUND)
-   target_link_libraries("${LIB_NAME}" ${LIBUSB_1_LIBRARIES})
+ target_link_libraries("${LIB_NAME}" pcl_common pcl_io_ply)
+ if(VTK_FOUND)
+   if(${VTK_VERSION} VERSION_LESS 9.0)
+@@ -351,10 +355,6 @@ if(VTK_FOUND)
+   endif()
+ endif()
+
+-if(PNG_FOUND)
+-  target_link_libraries("${LIB_NAME}" ${PNG_LIBRARIES})
+-endif()
+-
+ if(LIBUSB_FOUND)
+   target_link_libraries("${LIB_NAME}" libusb::libusb)
  endif()
+-- 
+2.31.1.windows.1
+

ports/pcl/fix_cmake_find_package_suffixes.patch

@@ -0,0 +1,20 @@
+diff --git a/cmake/pcl_options.cmake b/cmake/pcl_options.cmake
+index 6570d75f1..1d9b0d84f 100644
+--- a/cmake/pcl_options.cmake
++++ b/cmake/pcl_options.cmake
+@@ -7,14 +7,13 @@ if(PCL_SHARED_LIBS)
+   set(PCL_LIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+   set(PCL_LIB_TYPE "SHARED")
+ #  set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
+-  if(WIN32)
++  if(0)
+     set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_IMPORT_LIBRARY_SUFFIX})
+   endif()
+ else()
+   set(PCL_LIB_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX})
+   set(PCL_LIB_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
+   set(PCL_LIB_TYPE "STATIC")
+-  set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
+ endif()
+ mark_as_advanced(PCL_SHARED_LIBS)
+

ports/pcl/pcl_config.patch

@@ -1,15 +1,25 @@
+From 475e7923979878d48b1d67362be7f1e116538dfd Mon Sep 17 00:00:00 2001
+From: Wenquan Duan <1784104469@qq.com>
+Date: Wed, 27 Oct 2021 01:37:45 +0800
+Subject: [PATCH] patch
+
+---
+ PCLConfig.cmake.in | 18 +++---------------
+ 1 file changed, 3 insertions(+), 15 deletions(-)
+
 diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
-index 9f78fcf..0cbe94f 100644
+index a1283a810..77155c872 100644
 --- a/PCLConfig.cmake.in
 +++ b/PCLConfig.cmake.in
-@@ -396,25 +396,16 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR)
+@@ -384,6 +384,7 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR)
  if(WIN32 AND NOT MINGW)
  # PCLConfig.cmake is installed to PCL_ROOT/cmake
    get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
 +  get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
- else()
- # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
-   get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
+   if(EXISTS "${PCL_ROOT}/3rdParty")
+     set(PCL_ALL_IN_ONE_INSTALLER ON)
+   endif()
+@@ -393,22 +394,9 @@ else()
  endif()
 
  # check whether PCLConfig.cmake is found into a PCL installation or in a build tree
@@ -18,16 +28,22 @@ index 9f78fcf..0cbe94f 100644
 -  # pcl_message("Found a PCL installation")
 -  set(PCL_CONF_INCLUDE_DIR "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
 -  set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@")
--  if(EXISTS "${PCL_ROOT}/3rdParty")
--    set(PCL_ALL_IN_ONE_INSTALLER ON)
--  endif()
 -elseif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
 -  # Found a non-standard (likely ANDROID) PCL installation
 -  # pcl_message("Found a PCL installation")
 +if(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
    set(PCL_CONF_INCLUDE_DIR "${PCL_ROOT}/include")
 -  set(PCL_LIBRARY_DIRS "${PCL_ROOT}/lib")
+-elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h")
+-  # Found PCLConfig.cmake in a build tree of PCL
+-  # pcl_message("PCL found into a build tree.")
+-  set(PCL_CONF_INCLUDE_DIR "${PCL_DIR}/include") # for pcl_config.h
+-  set(PCL_LIBRARY_DIRS "${PCL_DIR}/@LIB_INSTALL_DIR@")
+-  set(PCL_SOURCES_TREE "@CMAKE_SOURCE_DIR@")
 +  set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@" "${PCL_ROOT}/debug/@LIB_INSTALL_DIR@")
-   if(EXISTS "${PCL_ROOT}/3rdParty")
-     set(PCL_ALL_IN_ONE_INSTALLER ON)
-   endif()
+ else()
+   pcl_report_not_found("PCL can not be found on this machine")
+ endif()
+-- 
+2.31.1.windows.1
+

ports/pcl/portfile.cmake

@@ -1,19 +1,17 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO PointCloudLibrary/pcl
-    REF d98313133b014553ab1b1b5b112f9aade837d55c # pcl-1.11.1
-    SHA512 4d60f34d4fbf0a4b4caf9cc4391af471ebd260b3bbac106d45e5ff38448894ea4dc82d5320c2e395c537a4414eb13c6a6a0eb6c13e4e1cc1d831d4bf24067966
+    REF pcl-1.12.0
+    SHA512 ce0544fdd82bcc415f81a9c74d58e5f6da2d0e0aaa54238a2601eca90386774155f1e032e6fb55a9edbf467ffa5ebf2ad695ec652ab437b323b8c6241f81193f
     HEAD_REF master
     PATCHES
         pcl_utils.patch
         pcl_config.patch
         boost-1.70.patch
         fix-link-libpng.patch
         remove-broken-targets.patch
-        fix-check-sse.patch
-        realsense2.patch
-        add-gcc-version-check.patch
         fix-find-qhull.patch
+        fix_cmake_find_package_suffixes.patch
 )
 
 file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindQhull.cmake)
@@ -40,7 +38,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         vtk     WITH_VTK
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
@@ -59,8 +57,8 @@ vcpkg_configure_cmake(
         ${FEATURE_OPTIONS}
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup()
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

ports/pcl/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "pcl",
-  "version": "1.11.1",
-  "port-version": 5,
+  "version": "1.12.0",
   "description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.",
   "homepage": "https://github.com/PointCloudLibrary/pcl",
   "supports": "!(arm64 & windows)",
@@ -26,7 +25,15 @@
     "eigen3",
     "flann",
     "libpng",
-    "qhull"
+    "qhull",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ],
   "features": {
     "cuda": {

ports/rtabmap/001_fix_with_qt.patch

@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3c1a46f6..39cb1656 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -990,13 +990,13 @@ IF(ANDROID)
+    IF(BUILD_APP)
+       ADD_SUBDIRECTORY( app )
+    ENDIF(BUILD_APP)
++ELSEIF(NOT WITH_QT)
++   MESSAGE(WARNING "the GUI lib and the stand-alone application will not be compiled...")
+ ELSEIF(Qt5_FOUND OR (QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND))
+    ADD_SUBDIRECTORY( guilib )
+    IF(BUILD_APP)
+       ADD_SUBDIRECTORY( app )
+    ENDIF(BUILD_APP)
+-ELSEIF(WITH_QT)
+-   MESSAGE(WARNING "Qt not found, the GUI lib and the stand-alone application will not be compiled...")
+ ENDIF()
+
+ IF(BUILD_TOOLS)