early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,27 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9bb05f..31fab8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,6 +215,10 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/omplConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/omplConfigVersion.cmake
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ompl/cmake
COMPONENT ompl)
+install(EXPORT ompl
+ DESTINATION "share/ompl"
+ FILE ompl-targets.cmake
+)
# script to install ompl on Ubuntu
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/install-ompl-ubuntu.sh.in"
diff --git a/src/ompl/CMakeLists.txt b/src/ompl/CMakeLists.txt
index 9ea130e..6dda4df 100644
--- a/src/ompl/CMakeLists.txt
+++ b/src/ompl/CMakeLists.txt
@@ -83,6 +83,7 @@ endif (MSVC)
# install the library
install(TARGETS ompl
+ EXPORT ompl
DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT ompl)
if (NOT MSVC)

View File

@@ -0,0 +1,40 @@
diff --git a/omplConfig.cmake.in b/omplConfig.cmake.in
index 465de25d..d1e91929 100644
--- a/omplConfig.cmake.in
+++ b/omplConfig.cmake.in
@@ -18,8 +18,11 @@ set(OMPL_MAJOR_VERSION @PROJECT_VERSION_MAJOR@)
set(OMPL_MINOR_VERSION @PROJECT_VERSION_MINOR@)
set(OMPL_PATCH_VERSION @PROJECT_VERSION_PATCH@)
+include(CMakeFindDependencyMacro)
+find_dependency(Boost 1.58 COMPONENTS serialization filesystem system program_options)
+find_dependency(Eigen3)
set_and_check(OMPL_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
-set(OMPL_INCLUDE_DIRS "${OMPL_INCLUDE_DIR};@Boost_INCLUDE_DIR@;@EIGEN3_INCLUDE_DIR@")
+set(OMPL_INCLUDE_DIRS "${OMPL_INCLUDE_DIR};${Boost_INCLUDE_DIR};${EIGEN3_INCLUDE_DIR}")
foreach(_dir @FLANN_INCLUDE_DIRS@;@ODE_INCLUDE_DIRS@;@SPOT_INCLUDE_DIRS@;@TRIANGLE_INCLUDE_DIR@;@FCL_INCLUDE_DIRS@;@PQP_INCLUDE_DIR@;@ASSIMP_INCLUDE_DIRS@;@OPENGL_INCLUDE_DIR@)
if(_dir)
list(APPEND OMPL_INCLUDE_DIRS "${_dir}")
@@ -29,7 +32,7 @@ list(REMOVE_DUPLICATES OMPL_INCLUDE_DIRS)
set(OMPL_INCLUDE_DIRS "${OMPL_INCLUDE_DIRS}" CACHE STRING "Include path for OMPL and its dependencies")
set_and_check(OMPL_LIBRARY_DIR @PACKAGE_LIB_INSTALL_DIR@)
-set(OMPL_LIBRARY_DIRS "${OMPL_LIBRARY_DIR};@Boost_LIBRARY_DIRS@")
+set(OMPL_LIBRARY_DIRS "${OMPL_LIBRARY_DIR};${Boost_LIBRARY_DIRS}")
foreach(_dir @FLANN_LIBRARY_DIRS@;@ODE_LIBRARY_DIRS@;@SPOT_LIBRARY_DIRS@;@FCL_LIBRARY_DIRS@;@ASSIMP_LIBRARY_DIRS@)
if(_dir)
list(APPEND OMPL_LIBRARY_DIRS "${_dir}")
@@ -40,7 +43,7 @@ set(OMPL_LIBRARY_DIRS "${OMPL_LIBRARY_DIRS}" CACHE STRING "Library path for OMPL
find_library(OMPL_LIBRARIES NAMES ompl.${OMPL_VERSION} ompl
PATHS ${OMPL_LIBRARY_DIR} NO_DEFAULT_PATH)
-foreach(_lib @Boost_SERIALIZATION_LIBRARY@;@Boost_FILESYSTEM_LIBRARY@;@Boost_SYSTEM_LIBRARY@;@ODE_LIBRARIES@;@SPOT_LIBRARIES@)
+foreach(_lib ${Boost_SERIALIZATION_LIBRARY};${Boost_FILESYSTEM_LIBRARY};${Boost_SYSTEM_LIBRARY};@ODE_LIBRARIES@;@SPOT_LIBRARIES@)
if(_lib)
list(APPEND OMPL_LIBRARIES "${_lib}")
endif()
@@ -61,3 +64,4 @@ endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(ompl DEFAULT_MSG OMPL_INCLUDE_DIRS OMPL_LIBRARY_DIRS OMPL_LIBRARIES)
+include(${CMAKE_CURRENT_LIST_DIR}/ompl-targets.cmake)

59
externals/vcpkg/ports/ompl/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,59 @@
vcpkg_buildpath_length_warning(37)
# See https://github.com/ompl/ompl/blob/main/src/ompl/CMakeLists.txt#L49-L54
if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
else()
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
endif()
set(OMPL_VERSION 1.5.1)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ompl/ompl
REF 1.5.1
SHA512 2f28d29f32f3bb03e67b29ce251e4786364847a25e3c4cf66d7663ed38dca4da71d4e03cf9ce647710d9524a3907c76c09795e77f041cb8822f695d28f5ca570
HEAD_REF master
PATCHES
0001_Export_targets.patch
0002_Fix_config.patch
)
# Based on selected features different files get downloaded, so use the following command instead of patch.
vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "find_package(Eigen3 REQUIRED)" "find_package(Eigen3 REQUIRED CONFIG)")
vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "find_package(ccd REQUIRED)" "find_package(ccd REQUIRED CONFIG)")
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DOMPL_VERSIONED_INSTALL=OFF
-DOMPL_REGISTRATION=OFF
-DOMPL_BUILD_DEMOS=OFF
-DOMPL_BUILD_TESTS=OFF
-DOMPL_BUILD_PYBINDINGS=OFF
-DOMPL_BUILD_PYTESTS=OFF
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH share/ompl/cmake)
vcpkg_fixup_pkgconfig()
# 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(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

28
externals/vcpkg/ports/ompl/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,28 @@
{
"name": "ompl",
"version": "1.5.1",
"port-version": 5,
"description": "The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms",
"homepage": "https://ompl.kavrakilab.org/",
"dependencies": [
"boost-dynamic-bitset",
"boost-filesystem",
"boost-graph",
"boost-odeint",
"boost-program-options",
"boost-serialization",
"boost-system",
"boost-test",
"boost-timer",
"boost-ublas",
"eigen3",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}