From b8ef2f3405ada27d1b0729c8f7142f034d72a162 Mon Sep 17 00:00:00 2001
From: jim wang <122244446+jimwang118@users.noreply.github.com>
Date: Fri, 26 Jul 2024 20:56:23 +0000
Subject: [PATCH] [ompl] Fix compilation errors on linux and osx (#40080)

---
 ports/ompl/0003_fix_dep.patch | 25 +++++++++++++++++++++++++
 ports/ompl/portfile.cmake     |  2 +-
 ports/ompl/vcpkg.json         |  2 +-
 scripts/ci.baseline.txt       |  3 ---
 versions/baseline.json        |  2 +-
 versions/o-/ompl.json         |  5 +++++
 6 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 ports/ompl/0003_fix_dep.patch

diff --git a/ports/ompl/0003_fix_dep.patch b/ports/ompl/0003_fix_dep.patch
new file mode 100644
index 0000000000..a8d392c776
--- /dev/null
+++ b/ports/ompl/0003_fix_dep.patch
@@ -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})
diff --git a/ports/ompl/portfile.cmake b/ports/ompl/portfile.cmake
index c66d58d479..85206fb067 100644
--- a/ports/ompl/portfile.cmake
+++ b/ports/ompl/portfile.cmake
@@ -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
diff --git a/ports/ompl/vcpkg.json b/ports/ompl/vcpkg.json
index 8505a7854d..1d88596746 100644
--- a/ports/ompl/vcpkg.json
+++ b/ports/ompl/vcpkg.json
@@ -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": [
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 69927efa99..2547e28da1 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -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.
diff --git a/versions/baseline.json b/versions/baseline.json
index bbfdf79792..5dc9734869 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6434,7 +6434,7 @@
     },
     "ompl": {
       "baseline": "1.6.0",
-      "port-version": 1
+      "port-version": 2
     },
     "omplapp": {
       "baseline": "1.5.1",
diff --git a/versions/o-/ompl.json b/versions/o-/ompl.json
index 26f473cf99..7f6683f142 100644
--- a/versions/o-/ompl.json
+++ b/versions/o-/ompl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "af59be72a074fcdfbfaf6500afca3442e0a2648b",
+      "version": "1.6.0",
+      "port-version": 2
+    },
     {
       "git-tree": "052eff04bde8b7a8eee0d49d4e017679a2d1aff2",
       "version": "1.6.0",