From 8cdff13a6e40ab13dc30cb529998a2541d404274 Mon Sep 17 00:00:00 2001
From: Nicolas Phister <nicolas@phister.fr>
Date: Mon, 27 Feb 2023 21:01:43 +0100
Subject: [PATCH] [recast] fix include paths (#29868)

---
 ports/recast/CMakeLists.txt | 22 +++++++++++-----------
 ports/recast/vcpkg.json     |  2 +-
 versions/baseline.json      |  2 +-
 versions/r-/recast.json     |  5 +++++
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/ports/recast/CMakeLists.txt b/ports/recast/CMakeLists.txt
index 7ccc0828a1f..a82f7d91d43 100644
--- a/ports/recast/CMakeLists.txt
+++ b/ports/recast/CMakeLists.txt
@@ -41,12 +41,12 @@ target_include_directories(
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/DetourCrowd/Include>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/DetourTileCache/Include>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Recast/Include>
-  $<INSTALL_INTERFACE:include>
-  $<INSTALL_INTERFACE:include/Detour/Include>
-  $<INSTALL_INTERFACE:include/DetourCrowd/Include>
-  $<INSTALL_INTERFACE:include/DetourTileCache/Include>
-  $<INSTALL_INTERFACE:include/Recast/Include>
-  $<INSTALL_INTERFACE:include/DebugUtils/Include>
+  $<INSTALL_INTERFACE:include/recast/>
+  $<INSTALL_INTERFACE:include/recast/Detour/Include>
+  $<INSTALL_INTERFACE:include/recast/DetourCrowd/Include>
+  $<INSTALL_INTERFACE:include/recast/DetourTileCache/Include>
+  $<INSTALL_INTERFACE:include/recast/Recast/Include>
+  $<INSTALL_INTERFACE:include/recast/DebugUtils/Include>
 )
 
 install(
@@ -59,9 +59,9 @@ install(
 install(EXPORT unofficial-recast-config DESTINATION share/unofficial-recast)
 
 if(NOT DISABLE_INSTALL_HEADERS)
-  install(DIRECTORY DebugUtils/Include/ DESTINATION include/recast/DebugUtils)
-  install(DIRECTORY Detour/Include/ DESTINATION include/recast/Detour)
-  install(DIRECTORY DetourCrowd/Include/ DESTINATION include/recast/DetourCrowd)
-  install(DIRECTORY DetourTileCache/Include/ DESTINATION include/recast/DetourTileCache)
-  install(DIRECTORY Recast/Include/ DESTINATION include/recast/Recast)
+  install(DIRECTORY DebugUtils/Include/ DESTINATION include/recast/DebugUtils/Include)
+  install(DIRECTORY Detour/Include/ DESTINATION include/recast/Detour/Include)
+  install(DIRECTORY DetourCrowd/Include/ DESTINATION include/recast/DetourCrowd/Include)
+  install(DIRECTORY DetourTileCache/Include/ DESTINATION include/recast/DetourTileCache/Include)
+  install(DIRECTORY Recast/Include/ DESTINATION include/recast/Recast/Include)
 endif()
diff --git a/ports/recast/vcpkg.json b/ports/recast/vcpkg.json
index 7163e255a97..003d3d40e50 100644
--- a/ports/recast/vcpkg.json
+++ b/ports/recast/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "recast",
   "version": "1.5.1",
-  "port-version": 5,
+  "port-version": 6,
   "description": "Navigation-mesh Toolset for Games",
   "homepage": "https://github.com/recastnavigation/recastnavigation",
   "license": "Zlib",
diff --git a/versions/baseline.json b/versions/baseline.json
index eb21f8aa908..064fd4c19d6 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6798,7 +6798,7 @@
     },
     "recast": {
       "baseline": "1.5.1",
-      "port-version": 5
+      "port-version": 6
     },
     "recycle": {
       "baseline": "6.0.0",
diff --git a/versions/r-/recast.json b/versions/r-/recast.json
index 76bccf1b4df..521da827385 100644
--- a/versions/r-/recast.json
+++ b/versions/r-/recast.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f6f99b923ad8fbbee1aafd0deb361f8cf7eb7bd6",
+      "version": "1.5.1",
+      "port-version": 6
+    },
     {
       "git-tree": "fe2b42ef737e0b51a58bb9f56340e324ab8f82c3",
       "version": "1.5.1",