[ompl] update to version 1.4.2 (#6084)

- add feature to install ompl.app libraries, which add support for
reading meshes and collision checking
- remove patch and instead remove unwanted files via portfile

3 files changed, 39 insertions, 38 deletions

diff --git a/ports/ompl/001-disable-extra-components.patch b/ports/ompl/001-disable-extra-components.patch
deleted file mode 100644
index b1bb8bc39..000000000
--- a/ports/ompl/001-disable-extra-components.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fbde81b..da11bfe 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -173,12 +173,13 @@ endif()
- # R is needed for running Planner Arena locally
- find_program(R_EXEC R)
- 
--add_subdirectory(py-bindings)
-+# VCPKG PATCH: Disable extra components from library.
-+# add_subdirectory(py-bindings)
- add_subdirectory(src)
--add_subdirectory(tests)
--add_subdirectory(demos)
--add_subdirectory(scripts)
--add_subdirectory(doc)
-+# add_subdirectory(tests)
-+# add_subdirectory(demos)
-+# add_subdirectory(scripts)
-+# add_subdirectory(doc)
- 
- target_link_flags(ompl)
- set(PKG_NAME "ompl")
diff --git a/ports/ompl/CONTROL b/ports/ompl/CONTROL
index 082853664..2cadddeee 100644
--- a/ports/ompl/CONTROL
+++ b/ports/ompl/CONTROL
@@ -1,4 +1,8 @@
 Source: ompl

-Version: 1.4.1-2

+Version: 1.4.2-0

 Description: The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms

-Build-Depends: boost-disjoint-sets, boost-dynamic-bitset, boost-filesystem, boost-graph, boost-odeint, boost-program-options, boost-serialization, boost-system, boost-test, boost-ublas, eigen3
\ No newline at end of file
+Build-Depends: boost-disjoint-sets, boost-dynamic-bitset, boost-filesystem, boost-graph, boost-odeint, boost-program-options, boost-serialization, boost-system, boost-test, boost-ublas, eigen3

+

+Feature: app

+Description: Add support for reading meshes and performing collision checking

+Build-Depends: assimp, fcl

diff --git a/ports/ompl/portfile.cmake b/ports/ompl/portfile.cmake
index f03c3dd15..d1559b933 100644
--- a/ports/ompl/portfile.cmake
+++ b/ports/ompl/portfile.cmake
@@ -14,28 +14,32 @@ include(vcpkg_common_functions)
 

 string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)

 if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)

-    message(WARNING "Ompl's buildsystem uses very long paths and may fail on your system.\n"

+    message(WARNING "OMPL's buildsystem uses very long paths and may fail on your system.\n"

         "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."

     )

 endif()

 

-set(OMPL_VERSION 1.4.1)

+

+set(OMPL_VERSION 1.4.2)

+set(OMPL_DISTNAME "ompl")

+set(OMPL_CHECKSUM "1dc477ee471c0570fd94838b072105960e09186f29634e2f61d885153df36532ab40e30912b534c61f222c09dad63fc6097d324b53c265f9284f20c585d3095c")

+

+if("app" IN_LIST FEATURES)

+    set(OMPL_DISTNAME "omplapp")

+    set(OMPL_CHECKSUM "04812a659fd81c2c541907911cbf4e5987be034546e8e48ed3d11b2b2f9ad3f7931f15d30a32ce3b64deb66b13875970797ac5072e92bfa0841e8d27d85fcb18")

+endif()

+

 vcpkg_download_distfile(ARCHIVE

-    URLS "https://github.com/ompl/ompl/archive/${OMPL_VERSION}.zip"

-    FILENAME "ompl-${OMPL_VERSION}.zip"

-    SHA512 2552476e86fdd4d61a5663d401c18f873424127d04d2342f1e0e5d4a15212b952c9de59f1a2483c2c71ee3cc3aadbe1b5912ae7fa262c218dd0b22daadfcd95c

+    URLS "https://bitbucket.org/ompl/ompl/downloads/${OMPL_DISTNAME}-${OMPL_VERSION}-Source.tar.gz"

+    FILENAME "${OMPL_DISTNAME}-${OMPL_VERSION}.tar.gz"

+    SHA512 ${OMPL_CHECKSUM}

 )

 

 vcpkg_extract_source_archive_ex(

     OUT_SOURCE_PATH SOURCE_PATH

     ARCHIVE ${ARCHIVE}

     REF ${OMPL_VERSION}

-    PATCHES 

-        "001-disable-extra-components.patch"

 )

-# For some reason, demos and tests are being installed 

-# even when disabling the correct OMPL options.

-# The "001-disable-extra-components.patch" avoids that issue.

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

     PREFER_NINJA

@@ -52,9 +56,25 @@ vcpkg_install_cmake()
 

 vcpkg_fixup_cmake_targets(CONFIG_PATH share/ompl/cmake)

 

-# Remove debug distribution

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

+# Remove debug distribution and other, move ompl_benchmark to tools/ dir

+file(REMOVE_RECURSE

+    ${CURRENT_PACKAGES_DIR}/debug/include

+    ${CURRENT_PACKAGES_DIR}/debug/share

+    ${CURRENT_PACKAGES_DIR}/share/man

+    ${CURRENT_PACKAGES_DIR}/share/ompl/demos

+    ${CURRENT_PACKAGES_DIR}/share/ompl/ompl.conf

+    ${CURRENT_PACKAGES_DIR}/share/ompl/plannerarena

+)

+if ("app" IN_LIST FEATURES)

+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/ompl)

+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/ompl_benchmark.exe ${CURRENT_PACKAGES_DIR}/tools/ompl/ompl_benchmark.exe)

+    file(REMOVE_RECURSE

+        ${CURRENT_PACKAGES_DIR}/bin

+        ${CURRENT_PACKAGES_DIR}/debug/bin

+        ${CURRENT_PACKAGES_DIR}/share/ompl/resources

+        ${CURRENT_PACKAGES_DIR}/share/ompl/webapp

+    )

+endif()

 

 # Handle copyright

 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ompl RENAME copyright)