From 78c4f0f16af9f0b87c532efff029f01d5ed006e6 Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Thu, 28 Oct 2021 18:10:38 -0700
Subject: [PATCH] [osg-qt] Install to the correct location. (#21048)

---
 ports/osg-qt/portfile.cmake | 24 +++++++++++-------------
 ports/osg-qt/use-lib.patch  | 13 +++++++++++++
 ports/osg-qt/vcpkg.json     |  6 +++++-
 versions/baseline.json      |  2 +-
 versions/o-/osg-qt.json     |  5 +++++
 5 files changed, 35 insertions(+), 15 deletions(-)
 create mode 100644 ports/osg-qt/use-lib.patch

diff --git a/ports/osg-qt/portfile.cmake b/ports/osg-qt/portfile.cmake
index 97937f13d4..c760ed7d86 100644
--- a/ports/osg-qt/portfile.cmake
+++ b/ports/osg-qt/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
         OsgMacroUtils.patch
         fix-static-install.patch
         CMakeLists.patch
+        use-lib.patch
 )
 
 if(VCPKG_TARGET_IS_OSX)
@@ -21,19 +22,16 @@ else()
     set(OPTIONS -DDYNAMIC_OPENSCENEGRAPH=OFF)
 endif()
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS ${OPTIONS}
-            -DBUILD_OSG_EXAMPLES=OFF
-            -DOSG_BUILD_APPLICATION_BUNDLES=OFF
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${OPTIONS}
+        -DBUILD_OSG_EXAMPLES=OFF
+        -DOSG_BUILD_APPLICATION_BUNDLES=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
+vcpkg_fixup_pkgconfig()
 
-#Debug
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-# Handle License
-file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/osg-qt/use-lib.patch b/ports/osg-qt/use-lib.patch
new file mode 100644
index 0000000000..a194c1d719
--- /dev/null
+++ b/ports/osg-qt/use-lib.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 66e989a..3569cec 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -467,7 +467,7 @@ ENDIF()
+ 
+ IF(UNIX AND NOT WIN32 AND NOT APPLE)
+   IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
+-      SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
++      SET(LIB_POSTFIX "" CACHE STRING "suffix for 32/64 dir placement")
+       MARK_AS_ADVANCED(LIB_POSTFIX)
+   ENDIF()
+ ENDIF()
diff --git a/ports/osg-qt/vcpkg.json b/ports/osg-qt/vcpkg.json
index 0684871105..29d55fa16e 100644
--- a/ports/osg-qt/vcpkg.json
+++ b/ports/osg-qt/vcpkg.json
@@ -1,13 +1,17 @@
 {
   "name": "osg-qt",
   "version-string": "Qt5",
-  "port-version": 2,
+  "port-version": 3,
   "description": "osgQt - Qt project for making use of OpenSceneGraph(OSG)",
   "dependencies": [
     "osg",
     {
       "name": "qt5-base",
       "default-features": false
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
     }
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index dca03f6612..062cf1b5b5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5014,7 +5014,7 @@
     },
     "osg-qt": {
       "baseline": "Qt5",
-      "port-version": 2
+      "port-version": 3
     },
     "osgearth": {
       "baseline": "3.2",
diff --git a/versions/o-/osg-qt.json b/versions/o-/osg-qt.json
index 699d474b75..f922a1a491 100644
--- a/versions/o-/osg-qt.json
+++ b/versions/o-/osg-qt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8e92c5f14fae6b6a69e0818bf1509e03a1389d3c",
+      "version-string": "Qt5",
+      "port-version": 3
+    },
     {
       "git-tree": "743cc988a45a861fc3de537f6e8720a38a4cf90f",
       "version-string": "Qt5",