[fcl] Update to 0.6.0 (#10025)

* [fcl] Update to 0.6.0

* Add dependency eigen

4 files changed, 7 insertions, 107 deletions

diff --git a/ports/fcl/0001_fix_package_detection.patch b/ports/fcl/0001_fix_package_detection.patch
deleted file mode 100644
index 9ae1b60e5..000000000
--- a/ports/fcl/0001_fix_package_detection.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From c43e3771cc2ec314191e5d4a5b485aab258c1b18 Mon Sep 17 00:00:00 2001
-From: Mikhail Paulyshka <me@mixaill.tk>
-Date: Sun, 27 Aug 2017 04:12:36 +0300
-Subject: [PATCH] use cmake-exports for package detection
-
----
- CMakeLists.txt | 48 +++---------------------------------------------
- 1 file changed, 3 insertions(+), 45 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5a4a559..8978b61 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -65,32 +65,11 @@ if(FCL_COVERALLS)
- endif()
- 
- # Find Octomap (optional)
--find_package(PkgConfig QUIET)
--
- option(FCL_WITH_OCTOMAP "octomap library support" ON)
- set(FCL_HAVE_OCTOMAP 0)
- if(FCL_WITH_OCTOMAP)
--  if(PKG_CONFIG_FOUND)
--      pkg_check_modules(OCTOMAP QUIET octomap)
--  endif()
--  if(NOT OCTOMAP_FOUND)
--      # if pkgconfig is not installed, then fall back on more fragile detection
--      # of octomap
--      find_path(OCTOMAP_INCLUDE_DIRS octomap.h
--          PATH_SUFFIXES octomap)
--      find_library(OCTOMAP_LIBRARY_DIRS
--          ${CMAKE_SHARED_LIBRARY_PREFIX}octomap${CMAKE_SHARED_LIBRARY_SUFFIX})
--      if(OCTOMAP_INCLUDE_DIRS AND OCTOMAP_LIBRARY_DIRS)
--          set(OCTOMAP_LIBRARIES "octomap;octomath")
--      endif()
--  endif()
--  if (OCTOMAP_FOUND OR (OCTOMAP_INCLUDE_DIRS AND OCTOMAP_LIBRARY_DIRS))
--    string(REPLACE "." ";" VERSION_LIST ${OCTOMAP_VERSION})
--    list(GET VERSION_LIST 0 OCTOMAP_MAJOR_VERSION)
--    list(GET VERSION_LIST 1 OCTOMAP_MINOR_VERSION)
--    list(GET VERSION_LIST 2 OCTOMAP_PATCH_VERSION)
--    include_directories(${OCTOMAP_INCLUDE_DIRS})
--    link_directories(${OCTOMAP_LIBRARY_DIRS})
-+  find_package(OCTOMAP REQUIRED)
-+  if (OCTOMAP_FOUND)
-     set(FCL_HAVE_OCTOMAP 1)
-     message(STATUS "FCL uses Octomap")
-   else()
-@@ -116,28 +95,7 @@ endif()
- include_directories(BEFORE "include")
- include_directories("${CMAKE_CURRENT_BINARY_DIR}/include")
- 
--if(PKG_CONFIG_FOUND)
--  pkg_check_modules(CCD ccd)
--  # check to see if the pkg is installed under the libccd name
--  if(NOT CCD_FOUND)
--    pkg_check_modules(CCD libccd)
--  endif()
--endif()
--
--if(NOT CCD_FOUND)
--    # if pkgconfig is not installed, then fall back on more fragile detection
--    # of ccd
--    find_path(CCD_INCLUDE_DIRS ccd/ccd.h)
--    find_library(CCD_LIBRARY
--        ${CMAKE_SHARED_LIBRARY_PREFIX}ccd${CMAKE_SHARED_LIBRARY_SUFFIX})
--    if(CCD_INCLUDE_DIRS AND CCD_LIBRARY)
--        set(CCD_LIBRARIES "${CCD_LIBRARY}")
--    else()
--        message(FATAL_ERROR "Libccd is required by FCL")
--    endif()
--endif()
--include_directories(${CCD_INCLUDE_DIRS})
--link_directories(${CCD_LIBRARY_DIRS})
-+find_package(CCD REQUIRED)
- 
- add_subdirectory(include/fcl)
- add_subdirectory(src)
--- 
-2.12.2.windows.2
-
diff --git a/ports/fcl/0002-fix_dependencies.patch b/ports/fcl/0002-fix_dependencies.patch
deleted file mode 100644
index 34b069291..000000000
--- a/ports/fcl/0002-fix_dependencies.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 5ce1f77..1f3e863 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -10,8 +10,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
-   SOVERSION ${FCL_ABI_VERSION})
- 
- target_link_libraries(${PROJECT_NAME}
--  PUBLIC ${OCTOMAP_LIBRARIES}
--  PRIVATE ${CCD_LIBRARIES}
-+  PUBLIC octomap octomath ccd
-   PRIVATE ${Boost_LIBRARIES})
- 
- target_include_directories(${PROJECT_NAME} INTERFACE
diff --git a/ports/fcl/CONTROL b/ports/fcl/CONTROL
index 161192e79..efd311474 100644
--- a/ports/fcl/CONTROL
+++ b/ports/fcl/CONTROL
@@ -1,5 +1,5 @@
 Source: fcl

-Version: 0.5.0-7

+Version: 0.6.0

 Homepage: https://github.com/flexible-collision-library/fcl

 Description: a library for performing three types of proximity queries on a pair of geometric models composed of triangles

-Build-Depends: ccd, octomap

+Build-Depends: ccd, octomap, eigen3

diff --git a/ports/fcl/portfile.cmake b/ports/fcl/portfile.cmake
index 6c7f54551..cc5d87f14 100644
--- a/ports/fcl/portfile.cmake
+++ b/ports/fcl/portfile.cmake
@@ -1,16 +1,11 @@
-include(vcpkg_common_functions)
-
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO flexible-collision-library/fcl
-    REF 54e9619bc2b084ee50e986ac3308160d663481c4
-    SHA512 11bfa3fdeeda6766769a34d2248ca32b6b13ecb32b412c068aa1c7aa3495d55b3f7a82a93621965904f9813c3fd0f128a84f796ae5731d2ff15b85935a0e1261
-    HEAD_REF fcl-0.5
-    PATCHES
-        0001_fix_package_detection.patch
-        0002-fix_dependencies.patch
+    REF a13c681e41eb8180cba7d4fd32637511f588cb82 #v0.6.0
+    SHA512 b0fe70f411871ff50b6e5978c01e5849099bec7b68983c6d1ff1afa1628980eaabafd59748ee06e4337efeb77dba6c65af93868a5fc5df980a133a3f667ddccf
+    HEAD_REF master
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
@@ -42,6 +37,6 @@ string(REPLACE "unset(_expectedTargets)"
                "unset(_expectedTargets)\n\nfind_package(octomap REQUIRED)\nfind_package(ccd REQUIRED)" FCL_CONFIG "${FCL_CONFIG}")
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/fcl/fclConfig.cmake "${FCL_CONFIG}")
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fcl RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file