[ompl] Fix compilation errors on linux and osx (#40080)

This commit is contained in:
jim wang 2024-07-26 20:56:23 +00:00 committed by GitHub
parent c0a4611383
commit b8ef2f3405
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 33 additions and 6 deletions

View File

@ -0,0 +1,25 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc81419..88046b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,7 +183,7 @@ add_subdirectory(demos)
add_subdirectory(scripts)
add_subdirectory(doc)
-if(NOT MSVC)
+if(0)
target_link_flags(ompl)
set(PKG_NAME "ompl")
set(PKG_DESC "The Open Motion Planning Library")
diff --git a/src/ompl/CMakeLists.txt b/src/ompl/CMakeLists.txt
index 7057838..405fa78 100644
--- a/src/ompl/CMakeLists.txt
+++ b/src/ompl/CMakeLists.txt
@@ -61,6 +61,7 @@ target_link_libraries(ompl
${Boost_SYSTEM_LIBRARY}
${CMAKE_THREAD_LIBS_INIT})
+target_include_directories(ompl PUBLIC $<INSTALL_INTERFACE:include>)
if (OMPL_EXTENSION_ODE)
if (NOT CMAKE_VERSION VERSION_LESS 3.13)
target_link_directories(ompl PUBLIC ${ODE_LIBRARY_DIRS})

View File

@ -16,6 +16,7 @@ vcpkg_from_github(
PATCHES
0001_Export_targets.patch
0002_Fix_config.patch
0003_fix_dep.patch
)
# Based on selected features different files get downloaded, so use the following command instead of patch.
@ -37,7 +38,6 @@ vcpkg_cmake_configure(
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

View File

@ -1,7 +1,7 @@
{
"name": "ompl",
"version": "1.6.0",
"port-version": 1,
"port-version": 2,
"description": "The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms",
"homepage": "https://ompl.kavrakilab.org/",
"dependencies": [

View File

@ -831,9 +831,6 @@ ois:x64-android=fail
ompl:arm-neon-android=fail
ompl:arm64-android=fail
ompl:x64-android=fail
ompl:x64-osx=fail
ompl:arm64-osx=fail
ompl:x64-linux=fail
# opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected
onednn:x64-android=fail
# opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP.

View File

@ -6434,7 +6434,7 @@
},
"ompl": {
"baseline": "1.6.0",
"port-version": 1
"port-version": 2
},
"omplapp": {
"baseline": "1.5.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "af59be72a074fcdfbfaf6500afca3442e0a2648b",
"version": "1.6.0",
"port-version": 2
},
{
"git-tree": "052eff04bde8b7a8eee0d49d4e017679a2d1aff2",
"version": "1.6.0",