From 221ee432d28dc1c0dcc1ce6f56fe7ba9b615329c Mon Sep 17 00:00:00 2001
From: Ryan <ryan__mckenzie@hotmail.com>
Date: Tue, 6 Oct 2020 08:27:21 -0700
Subject: [PATCH] [infoware] fix linking issues with non-release builds
 (#13822)

---
 ports/infoware/CONTROL        | 19 -------------------
 ports/infoware/portfile.cmake |  1 +
 ports/infoware/vcpkg.json     | 23 +++++++++++++++++++++++
 3 files changed, 24 insertions(+), 19 deletions(-)
 delete mode 100644 ports/infoware/CONTROL
 create mode 100644 ports/infoware/vcpkg.json

diff --git a/ports/infoware/CONTROL b/ports/infoware/CONTROL
deleted file mode 100644
index d65130342b8..00000000000
--- a/ports/infoware/CONTROL
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: infoware
-Homepage: https://github.com/ThePhD/infoware
-Version: 0.5.5
-Description: C++ Library for pulling system and hardware information, without hitting the command line.
-# Note that independent usage and testing may work, but it seems to fail in CI environments for potential cross-compilation,
-# and is thusly noted here to note break how vcpkg builds things!
-Supports: !(arm|uwp)
-
-Feature: x11
-Description: Prefer usage of X11 to find graphical capabilities.
-
-Feature: d3d
-Description: Prefer usage of Direct3D to find graphical capabilities (typically only works on Windows systems).
-
-Feature: opencl
-Description: Prefer usage of OpenCL to find graphical capabilities of the system.
-
-Feature: opengl
-Description: Prefer usage of OpenGL to find graphical capabilities (may require additional libraries to be available for linking depending on the system).
diff --git a/ports/infoware/portfile.cmake b/ports/infoware/portfile.cmake
index bff5976d77b..92801eb9b3a 100644
--- a/ports/infoware/portfile.cmake
+++ b/ports/infoware/portfile.cmake
@@ -32,6 +32,7 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets()
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/ports/infoware/vcpkg.json b/ports/infoware/vcpkg.json
new file mode 100644
index 00000000000..fc6fd7d3202
--- /dev/null
+++ b/ports/infoware/vcpkg.json
@@ -0,0 +1,23 @@
+{
+  "$reason": "Note that independent usage and testing may work, but it seems to fail in CI environments for potential cross-compilation, and is thusly noted here to note break how vcpkg builds things!",
+  "name": "infoware",
+  "version-string": "0.5.5",
+  "port-version": 1,
+  "description": "C++ Library for pulling system and hardware information, without hitting the command line.",
+  "homepage": "https://github.com/ThePhD/infoware",
+  "supports": "!(arm | uwp)",
+  "features": {
+    "d3d": {
+      "description": "Prefer usage of Direct3D to find graphical capabilities (typically only works on Windows systems)."
+    },
+    "opencl": {
+      "description": "Prefer usage of OpenCL to find graphical capabilities of the system."
+    },
+    "opengl": {
+      "description": "Prefer usage of OpenGL to find graphical capabilities (may require additional libraries to be available for linking depending on the system)."
+    },
+    "x11": {
+      "description": "Prefer usage of X11 to find graphical capabilities."
+    }
+  }
+}