[rollup] Rollup PR 2021-07-16 (#19001)

* [rollup:2021-07-16 1/7] PR #18201 (@JackBoosY)

[vcpkg-cmake] Add check for unused cmake variables

* [rollup:2021-07-16 2/7] PR #18397 (@strega-nil)

[vcpkg_list] add new function

* [rollup:2021-07-16 3/7] PR #18782 (@strega-nil)

[scripts-audit] vcpkg_build_ninja

* [rollup:2021-07-16 4/7] PR #18784 (@strega-nil)

[scripts-audit] vcpkg_minimum_required

* [rollup:2021-07-16 5/7] PR #18785 (@strega-nil)

[scripts-audit] vcpkg_replace_string

* [rollup:2021-07-16 6/7] PR #18786 (@strega-nil)

[scripts-audit] windows scripts

* [rollup:2021-07-16 7/7] PR #18945 (@strega-nil)

[many ports] remove deprecated vcpkg_check_features call [1/5]

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>

47 files changed, 578 insertions, 262 deletions

diff --git a/ports/apr/CONTROL b/ports/apr/CONTROL
deleted file mode 100644
index cf2c0079a..000000000
--- a/ports/apr/CONTROL
+++ /dev/null
@@ -1,9 +0,0 @@
-Source: apr
-Version: 1.7.0
-Port-Version: 3
-Homepage: https://apr.apache.org/
-Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.
-Supports: !uwp
-
-Feature: private-headers
-Description: Install non-standard files required for building Apache httpd
diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake
index de969c20f..3b9bed664 100644
--- a/ports/apr/portfile.cmake
+++ b/ports/apr/portfile.cmake
@@ -17,7 +17,8 @@ vcpkg_extract_source_archive_ex(
 
 if (VCPKG_TARGET_IS_WINDOWS)
     vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-        private-headers   INSTALL_PRIVATE_H
+        FEATURES
+            private-headers INSTALL_PRIVATE_H
     )
 
     vcpkg_configure_cmake(
diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json
new file mode 100644
index 000000000..91fb9c713
--- /dev/null
+++ b/ports/apr/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "apr",
+  "version": "1.7.0",
+  "port-version": 4,
+  "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.",
+  "homepage": "https://apr.apache.org/",
+  "supports": "!uwp",
+  "features": {
+    "private-headers": {
+      "description": "Install non-standard files required for building Apache httpd"
+    }
+  }
+}
diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL
deleted file mode 100644
index 456ec806a..000000000
--- a/ports/azure-iot-sdk-c/CONTROL
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: azure-iot-sdk-c
-Version: 2020-12-09
-Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c
-Description: A C99 SDK for connecting devices to Microsoft Azure IoT services
-Homepage: https://github.com/Azure/azure-iot-sdk-c
-
-Feature: public-preview
-Description: A version of the azure-iot-sdk-c containing public-preview features.
-Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview], azure-uhttp-c[public-preview], azure-macro-utils-c[public-preview], umock-c[public-preview]
-
-Feature: use-prov-client
-Description: Enables device provisioning client for DPS
diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake
index 39def6f61..dafefb650 100644
--- a/ports/azure-iot-sdk-c/portfile.cmake
+++ b/ports/azure-iot-sdk-c/portfile.cmake
@@ -25,8 +25,9 @@ else()
 endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    use-prov-client hsm_type_symm_key
-    use-prov-client use_prov_client
+    FEATURES
+        use-prov-client hsm_type_symm_key
+        use-prov-client use_prov_client
 )
 
 file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/)
@@ -51,4 +52,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR
 
 configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
 
-vcpkg_copy_pdbs()
\ No newline at end of file
+vcpkg_copy_pdbs()
diff --git a/ports/azure-iot-sdk-c/vcpkg.json b/ports/azure-iot-sdk-c/vcpkg.json
new file mode 100644
index 000000000..78a74e518
--- /dev/null
+++ b/ports/azure-iot-sdk-c/vcpkg.json
@@ -0,0 +1,62 @@
+{
+  "name": "azure-iot-sdk-c",
+  "version-date": "2020-12-09",
+  "port-version": 1,
+  "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services",
+  "homepage": "https://github.com/Azure/azure-iot-sdk-c",
+  "dependencies": [
+    "azure-c-shared-utility",
+    "azure-macro-utils-c",
+    "azure-uamqp-c",
+    "azure-uhttp-c",
+    "azure-umqtt-c",
+    "parson",
+    "umock-c"
+  ],
+  "features": {
+    "public-preview": {
+      "description": "A version of the azure-iot-sdk-c containing public-preview features.",
+      "dependencies": [
+        {
+          "name": "azure-c-shared-utility",
+          "features": [
+            "public-preview"
+          ]
+        },
+        {
+          "name": "azure-macro-utils-c",
+          "features": [
+            "public-preview"
+          ]
+        },
+        {
+          "name": "azure-uamqp-c",
+          "features": [
+            "public-preview"
+          ]
+        },
+        {
+          "name": "azure-uhttp-c",
+          "features": [
+            "public-preview"
+          ]
+        },
+        {
+          "name": "azure-umqtt-c",
+          "features": [
+            "public-preview"
+          ]
+        },
+        {
+          "name": "umock-c",
+          "features": [
+            "public-preview"
+          ]
+        }
+      ]
+    },
+    "use-prov-client": {
+      "description": "Enables device provisioning client for DPS"
+    }
+  }
+}
diff --git a/ports/azure-kinect-sensor-sdk/CONTROL b/ports/azure-kinect-sensor-sdk/CONTROL
deleted file mode 100644
index 8b2137de4..000000000
--- a/ports/azure-kinect-sensor-sdk/CONTROL
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: azure-kinect-sensor-sdk
-Version: 1.4.1
-Homepage: https://github.com/microsoft/Azure-Kinect-Sensor-SDK
-Description: Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.
-Build-Depends: azure-c-shared-utility, glfw3, gtest, imgui, libusb, spdlog, cjson, ebml, libjpeg-turbo, matroska, libsoundio, libyuv, libuvc (linux)
-Supports: !osx
-
-Feature: docs
-Description: Build K4A doxygen documentation.
-
-Feature: tool
-Description: Build tools.
-Build-Depends: gl3w, glew, imgui[glfw-binding,opengl3-glew-binding]
diff --git a/ports/azure-kinect-sensor-sdk/portfile.cmake b/ports/azure-kinect-sensor-sdk/portfile.cmake
index 742298adf..5255481b4 100644
--- a/ports/azure-kinect-sensor-sdk/portfile.cmake
+++ b/ports/azure-kinect-sensor-sdk/portfile.cmake
@@ -19,8 +19,9 @@ get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
 vcpkg_add_to_path("${PYTHON3_DIR}")
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    docs K4A_BUILD_DOCS
-    tool BUILD_TOOLS
+    FEATURES
+        docs K4A_BUILD_DOCS
+        tool BUILD_TOOLS
 )
 
 # .rc file needs windows.h, so do not use PREFER_NINJA here
diff --git a/ports/azure-kinect-sensor-sdk/vcpkg.json b/ports/azure-kinect-sensor-sdk/vcpkg.json
new file mode 100644
index 000000000..4226c5adf
--- /dev/null
+++ b/ports/azure-kinect-sensor-sdk/vcpkg.json
@@ -0,0 +1,45 @@
+{
+  "name": "azure-kinect-sensor-sdk",
+  "version": "1.4.1",
+  "port-version": 1,
+  "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.",
+  "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK",
+  "supports": "!osx",
+  "dependencies": [
+    "azure-c-shared-utility",
+    "cjson",
+    "ebml",
+    "glfw3",
+    "gtest",
+    "imgui",
+    "libjpeg-turbo",
+    "libsoundio",
+    "libusb",
+    {
+      "name": "libuvc",
+      "platform": "linux"
+    },
+    "libyuv",
+    "matroska",
+    "spdlog"
+  ],
+  "features": {
+    "docs": {
+      "description": "Build K4A doxygen documentation."
+    },
+    "tool": {
+      "description": "Build tools.",
+      "dependencies": [
+        "gl3w",
+        "glew",
+        {
+          "name": "imgui",
+          "features": [
+            "glfw-binding",
+            "opengl3-glew-binding"
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/ports/bitserializer/CONTROL b/ports/bitserializer/CONTROL
deleted file mode 100644
index bc33cc552..000000000
--- a/ports/bitserializer/CONTROL
+++ /dev/null
@@ -1,22 +0,0 @@
-Source: bitserializer

-Version: 0.10

-Description: Core part of C++ 17 library for serialization to JSON, XML, YAML

-Homepage: https://bitbucket.org/Pavel_Kisliak/bitserializer

-Default-Features: cpprestjson-archive, rapidjson-archive, pugixml-archive

-Supports: !(arm|osx)

-

-Feature: cpprestjson-archive

-Build-Depends: cpprestsdk

-Description: Module for support JSON (implementation based on the CppRestSDK library)

-

-Feature: rapidjson-archive

-Build-Depends: rapidjson

-Description: Module for support JSON (implementation based on the RapidJson library)

-

-Feature: pugixml-archive

-Build-Depends: pugixml

-Description: Module for support XML (implementation based on the PugiXml library)

-

-Feature: rapidyaml-archive

-Build-Depends: ryml (!arm&!arm64&!osx)

-Description: Module for support YAML (implementation based on the RapidYaml library)

diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake
index d4ae86979..3b8e4184f 100644
--- a/ports/bitserializer/portfile.cmake
+++ b/ports/bitserializer/portfile.cmake
@@ -7,10 +7,11 @@ vcpkg_from_bitbucket(
 )

 

 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

-    "cpprestjson-archive"  BUILD_CPPRESTJSON_ARCHIVE

-    "rapidjson-archive"    BUILD_RAPIDJSON_ARCHIVE

-    "pugixml-archive"      BUILD_PUGIXML_ARCHIVE

-    "rapidyaml-archive"    BUILD_RAPIDYAML_ARCHIVE

+    FEATURES

+        "cpprestjson-archive"  BUILD_CPPRESTJSON_ARCHIVE

+        "rapidjson-archive"    BUILD_RAPIDJSON_ARCHIVE

+        "pugixml-archive"      BUILD_PUGIXML_ARCHIVE

+        "rapidyaml-archive"    BUILD_RAPIDYAML_ARCHIVE

 )

 

 vcpkg_configure_cmake(

diff --git a/ports/bitserializer/vcpkg.json b/ports/bitserializer/vcpkg.json
new file mode 100644
index 000000000..4866a2dc8
--- /dev/null
+++ b/ports/bitserializer/vcpkg.json
@@ -0,0 +1,42 @@
+{
+  "name": "bitserializer",
+  "version": "0.10",
+  "port-version": 1,
+  "description": "Core part of C++ 17 library for serialization to JSON, XML, YAML",
+  "homepage": "https://bitbucket.org/Pavel_Kisliak/bitserializer",
+  "supports": "!(arm | osx)",
+  "default-features": [
+    "cpprestjson-archive",
+    "pugixml-archive",
+    "rapidjson-archive"
+  ],
+  "features": {
+    "cpprestjson-archive": {
+      "description": "Module for support JSON (implementation based on the CppRestSDK library)",
+      "dependencies": [
+        "cpprestsdk"
+      ]
+    },
+    "pugixml-archive": {
+      "description": "Module for support XML (implementation based on the PugiXml library)",
+      "dependencies": [
+        "pugixml"
+      ]
+    },
+    "rapidjson-archive": {
+      "description": "Module for support JSON (implementation based on the RapidJson library)",
+      "dependencies": [
+        "rapidjson"
+      ]
+    },
+    "rapidyaml-archive": {
+      "description": "Module for support YAML (implementation based on the RapidYaml library)",
+      "dependencies": [
+        {
+          "name": "ryml",
+          "platform": "!arm & !arm64 & !osx"
+        }
+      ]
+    }
+  }
+}
diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake
index 6a56a4534..0d424e78f 100644
--- a/ports/bond/portfile.cmake
+++ b/ports/bond/portfile.cmake
@@ -13,9 +13,9 @@ vcpkg_from_github(
 
 if (VCPKG_TARGET_IS_WINDOWS)
     vcpkg_download_distfile(GBC_ARCHIVE
-    URLS "https://github.com/microsoft/bond/releases/download/${BOND_VER}/gbc-${BOND_VER}-amd64.zip"
-    FILENAME "gbc-${BOND_VER}-amd64.zip"
-    SHA512 41a4e01a9a0f6246a3c07f516f2c0cfc8a837eff2166c2bb787877e409d6f55eeb6084e63aabc3502492775a3fa7e381bf37fde0bdfced50a9d0b39dfaca7dfd
+        URLS "https://github.com/microsoft/bond/releases/download/${BOND_VER}/gbc-${BOND_VER}-amd64.zip"
+        FILENAME "gbc-${BOND_VER}-amd64.zip"
+        SHA512 41a4e01a9a0f6246a3c07f516f2c0cfc8a837eff2166c2bb787877e409d6f55eeb6084e63aabc3502492775a3fa7e381bf37fde0bdfced50a9d0b39dfaca7dfd
     )
 
     # Clear the generator to prevent it from updating
@@ -37,20 +37,21 @@ else()
 endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-  bond-over-grpc BOND_ENABLE_GRPC
+    FEATURES
+        bond-over-grpc BOND_ENABLE_GRPC
 )
 
 vcpkg_configure_cmake(
-  SOURCE_PATH ${SOURCE_PATH}
-  PREFER_NINJA
-  OPTIONS
-    -DBOND_LIBRARIES_ONLY=TRUE
-    -DBOND_GBC_PATH=${FETCHED_GBC_PATH}
-    -DBOND_SKIP_GBC_TESTS=TRUE
-    -DBOND_ENABLE_COMM=FALSE
-    -DBOND_FIND_RAPIDJSON=TRUE
-    -DBOND_STACK_OPTIONS=--allow-different-user
-    ${FEATURE_OPTIONS}
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBOND_LIBRARIES_ONLY=TRUE
+        -DBOND_GBC_PATH=${FETCHED_GBC_PATH}
+        -DBOND_SKIP_GBC_TESTS=TRUE
+        -DBOND_ENABLE_COMM=FALSE
+        -DBOND_FIND_RAPIDJSON=TRUE
+        -DBOND_STACK_OPTIONS=--allow-different-user
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/bond/vcpkg.json b/ports/bond/vcpkg.json
index 524cc9d0f..5155d3a41 100644
--- a/ports/bond/vcpkg.json
+++ b/ports/bond/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "bond",
-  "version-string": "9.0.3",
-  "port-version": 1,
+  "version": "9.0.3",
+  "port-version": 2,
   "description": "Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.",
   "homepage": "https://github.com/Microsoft/bond",
   "dependencies": [
diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake
index cee4a0e27..6d04e1e93 100644
--- a/ports/botan/portfile.cmake
+++ b/ports/botan/portfile.cmake
@@ -51,7 +51,8 @@ else()
 endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    amalgamation BOTAN_AMALGAMATION
+    FEATURES
+        amalgamation BOTAN_AMALGAMATION
 )
 
 function(BOTAN_BUILD BOTAN_BUILD_TYPE)
diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json
index 48b62c95c..0dbf7567d 100644
--- a/ports/botan/vcpkg.json
+++ b/ports/botan/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "botan",
   "version": "2.16.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A cryptography library written in C++11",
   "homepage": "https://botan.randombit.net",
   "supports": "!(windows & arm)",
diff --git a/ports/capstone/CONTROL b/ports/capstone/CONTROL
deleted file mode 100644
index 60e2a2a53..000000000
--- a/ports/capstone/CONTROL
+++ /dev/null
@@ -1,51 +0,0 @@
-Source: capstone
-Version: 4.0.2
-Port-Version: 1
-Homepage: https://github.com/aquynh/capstone
-Description: Multi-architecture disassembly framework
-
-Feature: arm
-Description: Capstone disassembly support for ARM
-
-Feature: arm64
-Description: Capstone disassembly support for ARM64
-
-Feature: evm
-Description: Capstone disassembly support for EVM
-
-Feature: m680x
-Description: Capstone disassembly support for M680X
-
-Feature: m68k
-Description: Capstone disassembly support for M68k
-
-Feature: mips
-Description: Capstone disassembly support for MIPS
-
-Feature: ppc
-Description: Capstone disassembly support for PowerPC
-
-Feature: sparc
-Description: Capstone disassembly support for SPARC
-
-Feature: sysz
-Description: Capstone disassembly support for SysZ
-
-Feature: tms320c64x
-Description: Capstone disassembly support for TMS320C64X
-
-Feature: x86
-Description: Capstone disassembly support for x86
-
-Feature: x86-reduce
-Description: Capstone disassembly support for x86 without support for less used instructions
-Build-Depends: capstone[x86]
-
-Feature: xcore
-Description: Capstone disassembly support for XCore
-
-Feature: diet
-Description: Build Capstone in diet mode (reduced features for smaller size)
-
-Feature: osxkernel
-Description: Support for emedding Capstone into OSX Kernel extensions
diff --git a/ports/capstone/portfile.cmake b/ports/capstone/portfile.cmake
index 3e01523df..bd28511cf 100644
--- a/ports/capstone/portfile.cmake
+++ b/ports/capstone/portfile.cmake
@@ -10,21 +10,22 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CS_BUILD_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CS_BUILD_SHARED)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    "arm"         CAPSTONE_ARM_SUPPORT
-    "arm64"       CAPSTONE_ARM64_SUPPORT
-    "evm"         CAPSTONE_EVM_SUPPORT
-    "m680x"       CAPSTONE_M680X_SUPPORT
-    "m68k"        CAPSTONE_M68K_SUPPORT
-    "mips"        CAPSTONE_MIPS_SUPPORT
-    "osxkernel"   CAPSTONE_OSXKERNEL_SUPPORT
-    "ppc"         CAPSTONE_PPC_SUPPORT
-    "sparc"       CAPSTONE_SPARC_SUPPORT
-    "sysz"        CAPSTONE_SYSZ_SUPPORT
-    "tms320c64x"  CAPSTONE_TMS320C64X_SUPPORT
-    "x86"         CAPSTONE_X86_SUPPORT
-    "x86-reduce"  CAPSTONE_X86_REDUCE
-    "xcore"       CAPSTONE_XCORE_SUPPORT
-    "diet"        CAPSTONE_BUILD_DIET
+    FEATURES
+        "arm"         CAPSTONE_ARM_SUPPORT
+        "arm64"       CAPSTONE_ARM64_SUPPORT
+        "evm"         CAPSTONE_EVM_SUPPORT
+        "m680x"       CAPSTONE_M680X_SUPPORT
+        "m68k"        CAPSTONE_M68K_SUPPORT
+        "mips"        CAPSTONE_MIPS_SUPPORT
+        "osxkernel"   CAPSTONE_OSXKERNEL_SUPPORT
+        "ppc"         CAPSTONE_PPC_SUPPORT
+        "sparc"       CAPSTONE_SPARC_SUPPORT
+        "sysz"        CAPSTONE_SYSZ_SUPPORT
+        "tms320c64x"  CAPSTONE_TMS320C64X_SUPPORT
+        "x86"         CAPSTONE_X86_SUPPORT
+        "x86-reduce"  CAPSTONE_X86_REDUCE
+        "xcore"       CAPSTONE_XCORE_SUPPORT
+        "diet"        CAPSTONE_BUILD_DIET
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/capstone/vcpkg.json b/ports/capstone/vcpkg.json
new file mode 100644
index 000000000..770f47943
--- /dev/null
+++ b/ports/capstone/vcpkg.json
@@ -0,0 +1,62 @@
+{
+  "name": "capstone",
+  "version": "4.0.2",
+  "port-version": 2,
+  "description": "Multi-architecture disassembly framework",
+  "homepage": "https://github.com/aquynh/capstone",
+  "features": {
+    "arm": {
+      "description": "Capstone disassembly support for ARM"
+    },
+    "arm64": {
+      "description": "Capstone disassembly support for ARM64"
+    },
+    "diet": {
+      "description": "Build Capstone in diet mode (reduced features for smaller size)"
+    },
+    "evm": {
+      "description": "Capstone disassembly support for EVM"
+    },
+    "m680x": {
+      "description": "Capstone disassembly support for M680X"
+    },
+    "m68k": {
+      "description": "Capstone disassembly support for M68k"
+    },
+    "mips": {
+      "description": "Capstone disassembly support for MIPS"
+    },
+    "osxkernel": {
+      "description": "Support for emedding Capstone into OSX Kernel extensions"
+    },
+    "ppc": {
+      "description": "Capstone disassembly support for PowerPC"
+    },
+    "sparc": {
+      "description": "Capstone disassembly support for SPARC"
+    },
+    "sysz": {
+      "description": "Capstone disassembly support for SysZ"
+    },
+    "tms320c64x": {
+      "description": "Capstone disassembly support for TMS320C64X"
+    },
+    "x86": {
+      "description": "Capstone disassembly support for x86"
+    },
+    "x86-reduce": {
+      "description": "Capstone disassembly support for x86 without support for less used instructions",
+      "dependencies": [
+        {
+          "name": "capstone",
+          "features": [
+            "x86"
+          ]
+        }
+      ]
+    },
+    "xcore": {
+      "description": "Capstone disassembly support for XCore"
+    }
+  }
+}
diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake
index 78fff33b6..d0500faef 100644
--- a/ports/ceres/portfile.cmake
+++ b/ports/ceres/portfile.cmake
@@ -27,11 +27,12 @@ file(REMOVE ${SOURCE_PATH}/cmake/FindEigen.cmake)
 file(REMOVE ${SOURCE_PATH}/cmake/FindSuiteSparse.cmake)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    "suitesparse"       SUITESPARSE
-    "cxsparse"          CXSPARSE
-    "lapack"            LAPACK
-    "eigensparse"       EIGENSPARSE
-    "tools"             GFLAGS
+    FEATURES
+        "suitesparse"       SUITESPARSE
+        "cxsparse"          CXSPARSE
+        "lapack"            LAPACK
+        "eigensparse"       EIGENSPARSE
+        "tools"             GFLAGS
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/ceres/vcpkg.json b/ports/ceres/vcpkg.json
index 927a150a2..b1be6bde6 100644
--- a/ports/ceres/vcpkg.json
+++ b/ports/ceres/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ceres",
   "version-semver": "2.0.0",
-  "port-version": 4,
+  "port-version": 5,
   "description": "non-linear optimization package",
   "homepage": "https://github.com/ceres-solver/ceres-solver",
   "dependencies": [
diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL
deleted file mode 100644
index ee817113a..000000000
--- a/ports/cgal/CONTROL
+++ /dev/null
@@ -1,10 +0,0 @@
-Source: cgal
-Version: 5.2.2
-Port-Version: 0
-Build-Depends: mpfr, gmp, zlib, boost-accumulators, boost-algorithm, boost-bimap, boost-callable-traits, boost-concept-check, boost-container, boost-core, boost-detail, boost-filesystem, boost-functional, boost-fusion, boost-geometry, boost-graph, boost-heap, boost-intrusive, boost-iostreams, boost-iterator, boost-lambda, boost-logic, boost-math, boost-mpl, boost-multi-index, boost-multiprecision, boost-numeric-conversion, boost-optional, boost-parameter, boost-pool, boost-preprocessor, boost-property-map, boost-property-tree, boost-ptr-container, boost-random, boost-range, boost-serialization, boost-spirit, boost-thread, boost-tuple, boost-type-traits, boost-units, boost-utility, boost-variant
-Homepage: https://github.com/CGAL/cgal
-Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.
-
-Feature: qt
-Build-Depends: qt5-base[core], qt5-3d, qt5-svg, qt5-xmlpatterns, qt5-script, eigen3
-Description: Qt GUI support for CGAL
diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake
index 87be4144f..729ece895 100644
--- a/ports/cgal/portfile.cmake
+++ b/ports/cgal/portfile.cmake
@@ -9,7 +9,8 @@ vcpkg_from_github(
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    qt WITH_CGAL_Qt5
+    FEATURES
+        qt WITH_CGAL_Qt5
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/cgal/vcpkg.json b/ports/cgal/vcpkg.json
new file mode 100644
index 000000000..1ac7f45ff
--- /dev/null
+++ b/ports/cgal/vcpkg.json
@@ -0,0 +1,69 @@
+{
+  "name": "cgal",
+  "version": "5.2.2",
+  "port-version": 1,
+  "description": "The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.",
+  "homepage": "https://github.com/CGAL/cgal",
+  "dependencies": [
+    "boost-accumulators",
+    "boost-algorithm",
+    "boost-bimap",
+    "boost-callable-traits",
+    "boost-concept-check",
+    "boost-container",
+    "boost-core",
+    "boost-detail",
+    "boost-filesystem",
+    "boost-functional",
+    "boost-fusion",
+    "boost-geometry",
+    "boost-graph",
+    "boost-heap",
+    "boost-intrusive",
+    "boost-iostreams",
+    "boost-iterator",
+    "boost-lambda",
+    "boost-logic",
+    "boost-math",
+    "boost-mpl",
+    "boost-multi-index",
+    "boost-multiprecision",
+    "boost-numeric-conversion",
+    "boost-optional",
+    "boost-parameter",
+    "boost-pool",
+    "boost-preprocessor",
+    "boost-property-map",
+    "boost-property-tree",
+    "boost-ptr-container",
+    "boost-random",
+    "boost-range",
+    "boost-serialization",
+    "boost-spirit",
+    "boost-thread",
+    "boost-tuple",
+    "boost-type-traits",
+    "boost-units",
+    "boost-utility",
+    "boost-variant",
+    "gmp",
+    "mpfr",
+    "zlib"
+  ],
+  "features": {
+    "qt": {
+      "description": "Qt GUI support for CGAL",
+      "dependencies": [
+        "eigen3",
+        "qt5-3d",
+        {
+          "name": "qt5-base",
+          "default-features": false
+        },
+        "qt5-script",
+        "qt5-svg",
+        "qt5-xmlpatterns"
+      ]
+    }
+  }
+}
diff --git a/ports/civetweb/CONTROL b/ports/civetweb/CONTROL
deleted file mode 100644
index 395e24465..000000000
--- a/ports/civetweb/CONTROL
+++ /dev/null
@@ -1,10 +0,0 @@
-Source: civetweb
-Version: 1.13
-Port-Version: 1
-Homepage: https://github.com/civetweb/civetweb
-Description: Easy to use, powerful, C/C++ embeddable web server.
-Supports: !uwp
-
-Feature: ssl
-Build-Depends: openssl
-Description: Enable SSL support
\ No newline at end of file
diff --git a/ports/civetweb/portfile.cmake b/ports/civetweb/portfile.cmake
index 2dae7f4d6..8af5c6d76 100644
--- a/ports/civetweb/portfile.cmake
+++ b/ports/civetweb/portfile.cmake
@@ -12,7 +12,8 @@ vcpkg_from_github(
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    ssl CIVETWEB_ENABLE_SSL
+    FEATURES
+        ssl CIVETWEB_ENABLE_SSL
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/civetweb/vcpkg.json b/ports/civetweb/vcpkg.json
new file mode 100644
index 000000000..77ac71bf0
--- /dev/null
+++ b/ports/civetweb/vcpkg.json
@@ -0,0 +1,16 @@
+{
+  "name": "civetweb",
+  "version": "1.13",
+  "port-version": 2,
+  "description": "Easy to use, powerful, C/C++ embeddable web server.",
+  "homepage": "https://github.com/civetweb/civetweb",
+  "supports": "!uwp",
+  "features": {
+    "ssl": {
+      "description": "Enable SSL support",
+      "dependencies": [
+        "openssl"
+      ]
+    }
+  }
+}
diff --git a/ports/cjson/CONTROL b/ports/cjson/CONTROL
deleted file mode 100644
index 27474316a..000000000
--- a/ports/cjson/CONTROL
+++ /dev/null
@@ -1,7 +0,0 @@
-Source: cjson

-Version: 2019-11-30-1

-Description: Ultralightweight JSON parser in ANSI C

-Homepage: https://github.com/DaveGamble/cJSON

-

-Feature: utils

-Description: Enable building the cJSON_Utils library

diff --git a/ports/cjson/portfile.cmake b/ports/cjson/portfile.cmake
index 058c9009d..52e84654a 100644
--- a/ports/cjson/portfile.cmake
+++ b/ports/cjson/portfile.cmake
@@ -8,7 +8,8 @@ vcpkg_from_github(
 

 vcpkg_check_features(

     OUT_FEATURE_OPTIONS FEATURE_OPTIONS

-    utils ENABLE_CJSON_UTILS

+    FEATURES

+        utils ENABLE_CJSON_UTILS

 )

 

 if(CMAKE_HOST_WIN32)

diff --git a/ports/cjson/vcpkg.json b/ports/cjson/vcpkg.json
new file mode 100644
index 000000000..92bec5fb2
--- /dev/null
+++ b/ports/cjson/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "cjson",
+  "version-date": "2019-11-30",
+  "port-version": 2,
+  "description": "Ultralightweight JSON parser in ANSI C",
+  "homepage": "https://github.com/DaveGamble/cJSON",
+  "features": {
+    "utils": {
+      "description": "Enable building the cJSON_Utils library"
+    }
+  }
+}
diff --git a/ports/clue/CONTROL b/ports/clue/CONTROL
deleted file mode 100644
index dcd80809e..000000000
--- a/ports/clue/CONTROL
+++ /dev/null
@@ -1,7 +0,0 @@
-Source: clue
-Version: 1.0.0-alpha.7
-Homepage: https://github.com/martinmoene/clue
-Description: clue is a C++03 header-only library to log messages with a severity and optional module identifier. 
-
-Feature: test
-Description: Build test
\ No newline at end of file
diff --git a/ports/clue/portfile.cmake b/ports/clue/portfile.cmake
index 7fb67edd7..3b9715f9e 100644
--- a/ports/clue/portfile.cmake
+++ b/ports/clue/portfile.cmake
@@ -9,7 +9,8 @@ vcpkg_from_github(
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    test CLUE_BUILD_TEST
+    FEATURES
+        test CLUE_BUILD_TEST
 )
 
 vcpkg_configure_cmake(
@@ -24,4 +25,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
\ No newline at end of file
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
diff --git a/ports/clue/vcpkg.json b/ports/clue/vcpkg.json
new file mode 100644
index 000000000..105741b09
--- /dev/null
+++ b/ports/clue/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "clue",
+  "version-string": "1.0.0-alpha.7",
+  "port-version": 1,
+  "description": "clue is a C++03 header-only library to log messages with a severity and optional module identifier.",
+  "homepage": "https://github.com/martinmoene/clue",
+  "features": {
+    "test": {
+      "description": "Build test"
+    }
+  }
+}
diff --git a/ports/cppzmq/CONTROL b/ports/cppzmq/CONTROL
deleted file mode 100644
index f148c1a77..000000000
--- a/ports/cppzmq/CONTROL
+++ /dev/null
@@ -1,9 +0,0 @@
-Source: cppzmq
-Version: 4.7.1
-Port-Version: 1
-Build-Depends: zeromq
-Homepage: https://github.com/zeromq/cppzmq
-Description: lightweight messaging kernel, C++ bindings
-
-Feature: draft
-Description: Build and install draft
diff --git a/ports/cppzmq/portfile.cmake b/ports/cppzmq/portfile.cmake
index 2789190b7..aa968e8a3 100644
--- a/ports/cppzmq/portfile.cmake
+++ b/ports/cppzmq/portfile.cmake
@@ -7,7 +7,8 @@ vcpkg_from_github(
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    draft ENABLE_DRAFTS
+    FEATURES
+        draft ENABLE_DRAFTS
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/cppzmq/vcpkg.json b/ports/cppzmq/vcpkg.json
new file mode 100644
index 000000000..db7ce81fb
--- /dev/null
+++ b/ports/cppzmq/vcpkg.json
@@ -0,0 +1,15 @@
+{
+  "name": "cppzmq",
+  "version": "4.7.1",
+  "port-version": 2,
+  "description": "lightweight messaging kernel, C++ bindings",
+  "homepage": "https://github.com/zeromq/cppzmq",
+  "dependencies": [
+    "zeromq"
+  ],
+  "features": {
+    "draft": {
+      "description": "Build and install draft"
+    }
+  }
+}
diff --git a/ports/crashrpt/CONTROL b/ports/crashrpt/CONTROL
deleted file mode 100644
index 4b15e9d23..000000000
--- a/ports/crashrpt/CONTROL
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: crashrpt
-Version: 1.4.3
-Description: A crash reporting system for Windows applications
-Homepage: http://crashrpt.sourceforge.net/
-Build-Depends: dbghelp, libjpeg-turbo, libogg, libpng, libtheora, tinyxml, wtl, zlib
-Default-Features:
-
-Feature: probe
-Description: The CrashRptProbe library
-
-Feature: tests
-Description: Test application for crashrpt
-Build-Depends: crashrpt[core,probe]
-
-Feature: demos
-Description: Demo applications for CrashRptProbe
diff --git a/ports/crashrpt/portfile.cmake b/ports/crashrpt/portfile.cmake
index f52f8e19a..ffc83aa98 100644
--- a/ports/crashrpt/portfile.cmake
+++ b/ports/crashrpt/portfile.cmake
@@ -28,9 +28,10 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CRASHRPT_BUILD_SHARED_
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" CRASHRPT_LINK_CRT_AS_DLL)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    probe CRASHRPT_BUILD_PROBE
-    tests CRASHRPT_BUILD_TESTS
-    demos CRASHRPT_BUILD_DEMOS
+    FEATURES
+        probe CRASHRPT_BUILD_PROBE
+        tests CRASHRPT_BUILD_TESTS
+        demos CRASHRPT_BUILD_DEMOS
 )
 
 # PREFER_NINJA is not used below since CrashSender fails to build with errors like this one:
diff --git a/ports/crashrpt/vcpkg.json b/ports/crashrpt/vcpkg.json
new file mode 100644
index 000000000..3ed55e731
--- /dev/null
+++ b/ports/crashrpt/vcpkg.json
@@ -0,0 +1,37 @@
+{
+  "name": "crashrpt",
+  "version": "1.4.3",
+  "port-version": 1,
+  "description": "A crash reporting system for Windows applications",
+  "homepage": "http://crashrpt.sourceforge.net/",
+  "dependencies": [
+    "dbghelp",
+    "libjpeg-turbo",
+    "libogg",
+    "libpng",
+    "libtheora",
+    "tinyxml",
+    "wtl",
+    "zlib"
+  ],
+  "features": {
+    "demos": {
+      "description": "Demo applications for CrashRptProbe"
+    },
+    "probe": {
+      "description": "The CrashRptProbe library"
+    },
+    "tests": {
+      "description": "Test application for crashrpt",
+      "dependencies": [
+        {
+          "name": "crashrpt",
+          "default-features": false,
+          "features": [
+            "probe"
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL
deleted file mode 100644
index c9b8f1f68..000000000
--- a/ports/dlib/CONTROL
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: dlib
-Version: 19.21
-Port-Version: 4
-Build-Depends: libjpeg-turbo, libpng, blas, lapack
-Homepage: https://github.com/davisking/dlib
-Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++
-Default-Features: fftw3, sqlite3
-
-Feature: cuda
-Build-Depends: cuda, cudnn
-Description: CUDA support for dlib
-
-Feature: fftw3
-Build-Depends: fftw3
-Description: fftw3 support for dlib
-
-Feature: sqlite3
-Build-Depends: sqlite3
-Description: sqlite3 support for dlib
diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake
index 00f45d25f..481554b90 100644
--- a/ports/dlib/portfile.cmake
+++ b/ports/dlib/portfile.cmake
@@ -22,9 +22,10 @@ string(REPLACE "PNG_LIBRARY" "PNG_LIBRARIES" DLIB_CMAKE "${DLIB_CMAKE}")
 file(WRITE "${SOURCE_PATH}/dlib/CMakeLists.txt" "${DLIB_CMAKE}")
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-  "sqlite3"   DLIB_LINK_WITH_SQLITE3
-  "fftw3"     DLIB_USE_FFTW
-  "cuda"      DLIB_USE_CUDA
+    FEATURES
+        "sqlite3"   DLIB_LINK_WITH_SQLITE3
+        "fftw3"     DLIB_USE_FFTW
+        "cuda"      DLIB_USE_CUDA
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/dlib/vcpkg.json b/ports/dlib/vcpkg.json
new file mode 100644
index 000000000..bb60944f8
--- /dev/null
+++ b/ports/dlib/vcpkg.json
@@ -0,0 +1,38 @@
+{
+  "name": "dlib",
+  "version": "19.21",
+  "port-version": 5,
+  "description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++",
+  "homepage": "https://github.com/davisking/dlib",
+  "dependencies": [
+    "blas",
+    "lapack",
+    "libjpeg-turbo",
+    "libpng"
+  ],
+  "default-features": [
+    "fftw3",
+    "sqlite3"
+  ],
+  "features": {
+    "cuda": {
+      "description": "CUDA support for dlib",
+      "dependencies": [
+        "cuda",
+        "cudnn"
+      ]
+    },
+    "fftw3": {
+      "description": "fftw3 support for dlib",
+      "dependencies": [
+        "fftw3"
+      ]
+    },
+    "sqlite3": {
+      "description": "sqlite3 support for dlib",
+      "dependencies": [
+        "sqlite3"
+      ]
+    }
+  }
+}
diff --git a/ports/dmlc/CONTROL b/ports/dmlc/CONTROL
deleted file mode 100644
index 7021ffdcd..000000000
--- a/ports/dmlc/CONTROL
+++ /dev/null
@@ -1,9 +0,0 @@
-Source: dmlc
-Version: 2019-08-12
-Port-Version: 5
-Homepage: https://github.com/dmlc/dmlc-core
-Description: DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries.
-Supports: !uwp
-
-Feature: openmp
-Description: Build with openmp
diff --git a/ports/dmlc/portfile.cmake b/ports/dmlc/portfile.cmake
index fd339627a..3e4c7baeb 100644
--- a/ports/dmlc/portfile.cmake
+++ b/ports/dmlc/portfile.cmake
@@ -11,7 +11,8 @@ vcpkg_from_github(
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    openmp    ENABLE_OPENMP
+    FEATURES
+        openmp    ENABLE_OPENMP
 )
 
 if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
@@ -36,4 +37,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/dmlc)
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/dmlc/vcpkg.json b/ports/dmlc/vcpkg.json
new file mode 100644
index 000000000..36a4e0395
--- /dev/null
+++ b/ports/dmlc/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "dmlc",
+  "version-date": "2019-08-12",
+  "port-version": 6,
+  "description": "DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries.",
+  "homepage": "https://github.com/dmlc/dmlc-core",
+  "supports": "!uwp",
+  "features": {
+    "openmp": {
+      "description": "Build with openmp"
+    }
+  }
+}
diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json
index ffda714e3..88ee459ff 100644
--- a/ports/vcpkg-cmake/vcpkg.json
+++ b/ports/vcpkg-cmake/vcpkg.json
@@ -1,5 +1,5 @@
 {
   "name": "vcpkg-cmake",
   "version-date": "2021-06-25",
-  "port-version": 4
+  "port-version": 5
 }
diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake
index beffd32b0..aa99a81ce 100644
--- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake
+++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake
@@ -17,6 +17,8 @@ vcpkg_cmake_configure(
         <configure-setting>...]
     [OPTIONS_DEBUG
         <configure-setting>...]
+    [MAYBE_UNUSED_VARIABLES
+        <variable-name>...]
 )
 ```
 
@@ -55,6 +57,11 @@ By default, this function adds flags to `CMAKE_C_FLAGS` and `CMAKE_CXX_FLAGS`
 which set the default character set to utf-8 for MSVC.
 If the library sets its own code page, pass the `NO_CHARSET_FLAG` option.
 
+This function makes certain that all options passed in are used by the
+underlying CMake build system. If there are options that might be unused,
+perhaps on certain platforms, pass those variable names to
+`MAYBE_UNUSED_VARIABLES`.
+
 `LOGFILE_BASE` is used to set the base of the logfile names;
 by default, this is `config`, and thus the logfiles end up being something like
 `config-x86-windows-dbg.log`. You can set it to anything you like;
@@ -88,7 +95,7 @@ function(vcpkg_cmake_configure)
     cmake_parse_arguments(PARSE_ARGV 0 "arg"
         "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;WINDOWS_USE_MSBUILD;NO_CHARSET_FLAG"
         "SOURCE_PATH;GENERATOR;LOGFILE_BASE"
-        "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE"
+        "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;MAYBE_UNUSED_VARIABLES"
     )
 
     if(DEFINED CACHE{Z_VCPKG_CMAKE_GENERATOR})
@@ -102,9 +109,19 @@ function(vcpkg_cmake_configure)
         message(FATAL_ERROR "SOURCE_PATH must be set")
     endif()
     if(NOT DEFINED arg_LOGFILE_BASE)
-        set(arg_LOGFILE_BASE "config")
+        set(arg_LOGFILE_BASE "config-${TARGET_TRIPLET}")
     endif()
 
+    set(manually_specified_variables "")
+    foreach(option IN LISTS arg_OPTIONS arg_OPTIONS_RELEASE arg_OPTIONS_DEBUG)
+        if(option MATCHES "^-D([^:=]*)[:=]")
+            list(APPEND manually_specified_variables "${CMAKE_MATCH_1}")
+        endif()
+    endforeach()
+    list(REMOVE_DUPLICATES manually_specified_variables)
+    list(REMOVE_ITEM manually_specified_variables ${arg_MAYBE_UNUSED_VARIABLES})
+    debug_message("manually specified variables: ${manually_specified_variables}")
+
     if(CMAKE_HOST_WIN32)
         if(DEFINED ENV{PROCESSOR_ARCHITEW6432})
             set(host_architecture "$ENV{PROCESSOR_ARCHITEW6432}")
@@ -364,8 +381,11 @@ function(vcpkg_cmake_configure)
         vcpkg_execute_required_process(
             COMMAND ninja -v
             WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure"
-            LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}"
+            LOGNAME "${arg_LOGFILE_BASE}"
         )
+        list(APPEND config_logs
+            "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-out.log"
+            "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-err.log")
     else()
         if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
             message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
@@ -379,8 +399,11 @@ function(vcpkg_cmake_configure)
                     "-DCMAKE_BUILD_TYPE=Debug"
                     "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug"
                 WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
-                LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}-dbg"
+                LOGNAME "${arg_LOGFILE_BASE}-dbg"
             )
+            list(APPEND config_logs
+                "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-dbg-out.log"
+                "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-dbg-err.log")
         endif()
 
         if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
@@ -397,7 +420,42 @@ function(vcpkg_cmake_configure)
                 WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
                 LOGNAME "${arg_LOGFILE_BASE}-rel"
             )
+            list(APPEND config_logs
+                "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-rel-out.log"
+                "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-rel-err.log")
+        endif()
+    endif()
+    
+    set(all_unused_variables)
+    foreach(config_log IN LISTS config_logs)
+        if(NOT EXISTS "${config_log}")
+            continue()
         endif()
+        file(READ "${config_log}" log_contents)
+        debug_message("Reading configure log ${config_log}...")
+        if(NOT log_contents MATCHES "Manually-specified variables were not used by the project:\n\n((    [^\n]*\n)*)")
+            continue()
+        endif()
+        string(STRIP "${CMAKE_MATCH_1}" unused_variables) # remove leading `    ` and trailing `\n`
+        string(REPLACE "\n    " ";" unused_variables "${unused_variables}")
+        debug_message("unused variables: ${unused_variables}")
+        foreach(unused_variable IN LISTS unused_variables)
+            if(unused_variable IN_LIST manually_specified_variables)
+                debug_message("manually specified unused variable: ${unused_variable}")
+                list(APPEND all_unused_variables "${unused_variable}")
+            else()
+                debug_message("unused variable (not manually specified): ${unused_variable}")
+            endif()
+        endforeach()
+    endforeach()
+
+    if(DEFINED all_unused_variables)
+        list(REMOVE_DUPLICATES all_unused_variables)
+        list(JOIN all_unused_variables "\n    " all_unused_variables)
+        message(WARNING "The following variables are not used in CMakeLists.txt:
+    ${all_unused_variables}
+Please recheck them and remove the unnecessary options from the `vcpkg_cmake_configure` call.
+If these options should still be passed for whatever reason, please use the `MAYBE_UNUSED_VARIABLES` argument.")
     endif()
 
     set(Z_VCPKG_CMAKE_GENERATOR "${generator}" CACHE INTERNAL "The generator which was used to configure CMake.")