From 01ed87c315f49319774d2d9476fb59bcdb2ddeb0 Mon Sep 17 00:00:00 2001
From: Connor Broyles <cbroyles94@gmail.com>
Date: Mon, 18 Sep 2023 12:55:59 -0400
Subject: [PATCH] [osg] Fix debug targets for plugins in unofficial-osg
 (#33782)

* [osg] Fix debug plugin target locations

* [osg] Bump port version
---
 ports/osg/portfile.cmake | 7 +++++++
 ports/osg/vcpkg.json     | 2 +-
 versions/baseline.json   | 2 +-
 versions/o-/osg.json     | 5 +++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake
index f61e0a6d95..773ad97345 100644
--- a/ports/osg/portfile.cmake
+++ b/ports/osg/portfile.cmake
@@ -134,6 +134,13 @@ vcpkg_copy_pdbs()
 configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-osg-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-osg/unofficial-osg-config.cmake" @ONLY)
 vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-osg)
 
+# Add debug folder prefix for plugin targets. vcpkg_cmake_config_fixup only handles this for targets in bin/ and lib/.
+set(osg_plugins_debug_targets "${CURRENT_PACKAGES_DIR}/share/unofficial-osg/osg-plugins-debug.cmake")
+file(READ "${osg_plugins_debug_targets}" contents)
+string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" contents "${contents}")
+string(REPLACE "\${_IMPORT_PREFIX}/plugins" "\${_IMPORT_PREFIX}/debug/plugins" contents "${contents}")
+file(WRITE "${osg_plugins_debug_targets}" "${contents}")
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(APPEND "${CURRENT_PACKAGES_DIR}/include/osg/Config" "#ifndef OSG_LIBRARY_STATIC\n#define OSG_LIBRARY_STATIC 1\n#endif\n")
 endif()
diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json
index f27b33c37f..40a026c35f 100644
--- a/ports/osg/vcpkg.json
+++ b/ports/osg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "osg",
   "version": "3.6.5",
-  "port-version": 20,
+  "port-version": 21,
   "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.",
   "homepage": "https://www.openscenegraph.com/",
   "license": null,
diff --git a/versions/baseline.json b/versions/baseline.json
index 17b60805dd..d4270260e5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6206,7 +6206,7 @@
     },
     "osg": {
       "baseline": "3.6.5",
-      "port-version": 20
+      "port-version": 21
     },
     "osg-qt": {
       "baseline": "Qt5",
diff --git a/versions/o-/osg.json b/versions/o-/osg.json
index 829b4ea465..d1455d1087 100644
--- a/versions/o-/osg.json
+++ b/versions/o-/osg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6e9d4d04aae606c5ac02c497b17774d37e74de7a",
+      "version": "3.6.5",
+      "port-version": 21
+    },
     {
       "git-tree": "87727f247e97af37e53f77acadff05d6d06559d0",
       "version": "3.6.5",