[many ports] Apply host dependencies (#16479)

* [vcpkg] Add VCPKG_HOST_TRIPLET. Improve vcpkg.schema.json

* [many ports] Apply host dependencies

* [yasm-tool] Revert yasm-tool changes to split into PR #16478

* [many ports] Add versions

* [vcpkg.cmake] Revert change applied in other PR

* [boost-modular-build-helper] Merge from master

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

82 files changed, 551 insertions, 264 deletions

diff --git a/ports/ampl-mp/portfile.cmake b/ports/ampl-mp/portfile.cmake
index 89db3044e..730e687e6 100644
--- a/ports/ampl-mp/portfile.cmake
+++ b/ports/ampl-mp/portfile.cmake
@@ -16,12 +16,11 @@ vcpkg_from_github(
         install-targets.patch
 )
 
-if (VCPKG_TARGET_IS_WINDOWS AND (TRIPLET_SYSTEM_ARCH STREQUAL "arm" OR TRIPLET_SYSTEM_ARCH STREQUAL "arm64"))
-    set(EXPECTED_EXE ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/${PORT}/gen-expr-info.exe)
-    if (NOT EXISTS ${EXPECTED_EXE})
-        message(FATAL_ERROR "Please install ${PORT}:x86-windows first.")
+if (NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET)
+    set(ARITHCHK_EXEC ${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}/gen-expr-info${VCPKG_HOST_EXECUTABLE_SUFFIX})
+    if (NOT EXISTS "${ARITHCHK_EXEC}")
+        message(FATAL_ERROR "Expected ${ARITHCHK_EXEC} to exist.")
     endif()
-    set(ARITHCHK_EXEC ${EXPECTED_EXE})
 endif()
 
 vcpkg_configure_cmake(
diff --git a/ports/ampl-mp/vcpkg.json b/ports/ampl-mp/vcpkg.json
index cd6f91f55..8e97a5ce0 100644
--- a/ports/ampl-mp/vcpkg.json
+++ b/ports/ampl-mp/vcpkg.json
@@ -1,10 +1,15 @@
 {
   "name": "ampl-mp",
   "version-string": "2020-11-11",
+  "port-version": 1,
   "description": "An open-source library for mathematical programming",
   "homepage": "https://github.com/ampl/mp",
   "supports": "!uwp",
   "dependencies": [
-    "ampl-asl"
+    "ampl-asl",
+    {
+      "name": "ampl-mp",
+      "host": true
+    }
   ]
 }
diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake
index a38e389fa..01ec56744 100644
--- a/ports/boost-atomic/portfile.cmake
+++ b/ports/boost-atomic/portfile.cmake
@@ -16,7 +16,10 @@ string(REPLACE
 file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")

 file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-atomic requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-atomic/vcpkg.json b/ports/boost-atomic/vcpkg.json
index a1973a0a1..037194b3d 100644
--- a/ports/boost-atomic/vcpkg.json
+++ b/ports/boost-atomic/vcpkg.json
@@ -1,15 +1,22 @@
 {
   "name": "boost-atomic",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost atomic module",
   "homepage": "https://github.com/boostorg/atomic",
   "dependencies": [
     "boost-align",
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-integer",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-predef",
     "boost-preprocessor",
     "boost-static-assert",
diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake
index f0fa368eb..2ab75a253 100644
--- a/ports/boost-chrono/portfile.cmake
+++ b/ports/boost-chrono/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-chrono requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-chrono/vcpkg.json b/ports/boost-chrono/vcpkg.json
index 52463dcb7..402856f5a 100644
--- a/ports/boost-chrono/vcpkg.json
+++ b/ports/boost-chrono/vcpkg.json
@@ -1,15 +1,22 @@
 {
   "name": "boost-chrono",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost chrono module",
   "homepage": "https://github.com/boostorg/chrono",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-detail",
     "boost-integer",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-move",
     "boost-mpl",
     "boost-predef",
diff --git a/ports/boost-concept-check/vcpkg.json b/ports/boost-concept-check/vcpkg.json
index 5576019b8..6feae5b41 100644
--- a/ports/boost-concept-check/vcpkg.json
+++ b/ports/boost-concept-check/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "boost-concept-check",
   "version-string": "1.75.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Boost concept_check module",
   "homepage": "https://github.com/boostorg/concept_check",
   "dependencies": [
diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake
index 285ab0b17..f595c1a14 100644
--- a/ports/boost-container/portfile.cmake
+++ b/ports/boost-container/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-container requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-container/vcpkg.json b/ports/boost-container/vcpkg.json
index 439ea0d6f..d4b72049e 100644
--- a/ports/boost-container/vcpkg.json
+++ b/ports/boost-container/vcpkg.json
@@ -1,17 +1,24 @@
 {
   "name": "boost-container",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost container module",
   "homepage": "https://github.com/boostorg/container",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-container-hash",
     "boost-core",
     "boost-integer",
     "boost-intrusive",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-move",
     "boost-static-assert",
     "boost-type-traits",
diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake
index 355839869..8563ece83 100644
--- a/ports/boost-context/portfile.cmake
+++ b/ports/boost-context/portfile.cmake
@@ -14,7 +14,10 @@ string(REPLACE "import ../../config/checks/config" "import config/checks/config"
 file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")

 file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-context requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 configure_file(

     "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in"

     "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake"

diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json
index 2829cc688..b0879e26a 100644
--- a/ports/boost-context/vcpkg.json
+++ b/ports/boost-context/vcpkg.json
@@ -1,18 +1,24 @@
 {
   "name": "boost-context",
   "version-string": "1.75.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Boost context module",
   "homepage": "https://github.com/boostorg/context",
   "supports": "!uwp & !emscripten",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-core",
     "boost-detail",
     "boost-integer",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-pool",
     "boost-predef",
     "boost-smart-ptr",
diff --git a/ports/boost-contract/portfile.cmake b/ports/boost-contract/portfile.cmake
index de3fddacf..b83962def 100644
--- a/ports/boost-contract/portfile.cmake
+++ b/ports/boost-contract/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-contract requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-contract/vcpkg.json b/ports/boost-contract/vcpkg.json
index d95ecdd08..1c1765b3f 100644
--- a/ports/boost-contract/vcpkg.json
+++ b/ports/boost-contract/vcpkg.json
@@ -1,19 +1,26 @@
 {
   "name": "boost-contract",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost contract module",
   "homepage": "https://github.com/boostorg/contract",
   "dependencies": [
     "boost-any",
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-core",
     "boost-detail",
     "boost-exception",
     "boost-function",
     "boost-function-types",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-mpl",
     "boost-optional",
     "boost-preprocessor",
diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake
index 1ab75e65d..e65e5d422 100644
--- a/ports/boost-coroutine/portfile.cmake
+++ b/ports/boost-coroutine/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-coroutine requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-coroutine/vcpkg.json b/ports/boost-coroutine/vcpkg.json
index 42dde92ab..1f8336137 100644
--- a/ports/boost-coroutine/vcpkg.json
+++ b/ports/boost-coroutine/vcpkg.json
@@ -1,12 +1,16 @@
 {
   "name": "boost-coroutine",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost coroutine module",
   "homepage": "https://github.com/boostorg/coroutine",
   "supports": "!arm & !uwp & !emscripten",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     {
       "name": "boost-context",
@@ -16,7 +20,10 @@
     "boost-detail",
     "boost-exception",
     "boost-integer",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-move",
     "boost-system",
     "boost-thread",
diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake
index d57ca67e8..2c4d40bcb 100644
--- a/ports/boost-date-time/portfile.cmake
+++ b/ports/boost-date-time/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-date-time requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-date-time/vcpkg.json b/ports/boost-date-time/vcpkg.json
index 75b83ffab..12ea0168a 100644
--- a/ports/boost-date-time/vcpkg.json
+++ b/ports/boost-date-time/vcpkg.json
@@ -1,12 +1,16 @@
 {
   "name": "boost-date-time",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost date_time module",
   "homepage": "https://github.com/boostorg/date_time",
   "dependencies": [
     "boost-algorithm",
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-compatibility",
     "boost-config",
     "boost-core",
@@ -15,7 +19,10 @@
     "boost-io",
     "boost-lexical-cast",
     "boost-math",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-numeric-conversion",
     "boost-range",
     "boost-smart-ptr",
diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake
index 065d39969..b6fcea59b 100644
--- a/ports/boost-exception/portfile.cmake
+++ b/ports/boost-exception/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-exception requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-exception/vcpkg.json b/ports/boost-exception/vcpkg.json
index 8029992c1..f5e67cf90 100644
--- a/ports/boost-exception/vcpkg.json
+++ b/ports/boost-exception/vcpkg.json
@@ -1,14 +1,21 @@
 {
   "name": "boost-exception",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost exception module",
   "homepage": "https://github.com/boostorg/exception",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-core",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-smart-ptr",
     "boost-tuple",
     "boost-type-traits",
diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake
index bd518c8d2..dad07c59e 100644
--- a/ports/boost-fiber/portfile.cmake
+++ b/ports/boost-fiber/portfile.cmake
@@ -13,7 +13,10 @@ string(REPLACE "import ../../config/checks/config" "import config/checks/config"
 file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")

 file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-fiber requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-fiber/vcpkg.json b/ports/boost-fiber/vcpkg.json
index fe7865070..35d537197 100644
--- a/ports/boost-fiber/vcpkg.json
+++ b/ports/boost-fiber/vcpkg.json
@@ -1,13 +1,17 @@
 {
   "name": "boost-fiber",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost fiber module",
   "homepage": "https://github.com/boostorg/fiber",
   "supports": "!osx & !uwp & !arm & !emscripten",
   "dependencies": [
     "boost-algorithm",
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     {
       "name": "boost-context",
@@ -21,7 +25,10 @@
     },
     "boost-format",
     "boost-intrusive",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-predef",
     "boost-smart-ptr",
     "boost-vcpkg-helpers"
diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake
index 4efe36a63..e1bc985ea 100644
--- a/ports/boost-filesystem/portfile.cmake
+++ b/ports/boost-filesystem/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-filesystem requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-filesystem/vcpkg.json b/ports/boost-filesystem/vcpkg.json
index 2e07c445a..dd89855ee 100644
--- a/ports/boost-filesystem/vcpkg.json
+++ b/ports/boost-filesystem/vcpkg.json
@@ -1,12 +1,16 @@
 {
   "name": "boost-filesystem",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost filesystem module",
   "homepage": "https://github.com/boostorg/filesystem",
   "supports": "!uwp",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-core",
     "boost-detail",
@@ -14,7 +18,10 @@
     "boost-integer",
     "boost-io",
     "boost-iterator",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-predef",
     "boost-smart-ptr",
     "boost-system",
diff --git a/ports/boost-graph/portfile.cmake b/ports/boost-graph/portfile.cmake
index 26767b93f..2978a9d0f 100644
--- a/ports/boost-graph/portfile.cmake
+++ b/ports/boost-graph/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-graph requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-graph/vcpkg.json b/ports/boost-graph/vcpkg.json
index 38ac4f6d0..c4c8bf116 100644
--- a/ports/boost-graph/vcpkg.json
+++ b/ports/boost-graph/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "boost-graph",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost graph module",
   "homepage": "https://github.com/boostorg/graph",
   "dependencies": [
@@ -10,7 +11,10 @@
     "boost-assert",
     "boost-bimap",
     "boost-bind",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-compatibility",
     "boost-concept-check",
     "boost-config",
@@ -24,7 +28,10 @@
     "boost-iterator",
     "boost-lexical-cast",
     "boost-math",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-move",
     "boost-mpl",
     "boost-multi-index",
diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake
index 97a8ec479..4a5060160 100644
--- a/ports/boost-iostreams/portfile.cmake
+++ b/ports/boost-iostreams/portfile.cmake
@@ -9,7 +9,10 @@ vcpkg_from_github(
     PATCHES Removeseekpos.patch

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-iostreams requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-iostreams/vcpkg.json b/ports/boost-iostreams/vcpkg.json
index 3a9995159..4f772d939 100644
--- a/ports/boost-iostreams/vcpkg.json
+++ b/ports/boost-iostreams/vcpkg.json
@@ -1,18 +1,25 @@
 {
   "name": "boost-iostreams",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost iostreams module",
   "homepage": "https://github.com/boostorg/iostreams",
   "supports": "!uwp",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-core",
     "boost-detail",
     "boost-function",
     "boost-integer",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-mpl",
     "boost-numeric-conversion",
     "boost-preprocessor",
diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake
index 28d4ed08e..fb0f617c4 100644
--- a/ports/boost-locale/portfile.cmake
+++ b/ports/boost-locale/portfile.cmake
@@ -11,7 +11,10 @@ vcpkg_from_github(
         allow-force-finding-iconv.patch

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-locale requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 configure_file(

     "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in"

     "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake"

diff --git a/ports/boost-locale/vcpkg.json b/ports/boost-locale/vcpkg.json
index b9033ddf9..7e8008290 100644
--- a/ports/boost-locale/vcpkg.json
+++ b/ports/boost-locale/vcpkg.json
@@ -1,17 +1,24 @@
 {
   "name": "boost-locale",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost locale module",
   "homepage": "https://github.com/boostorg/locale",
   "supports": "!uwp",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-function",
     "boost-integer",
     "boost-iterator",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-smart-ptr",
     "boost-static-assert",
     "boost-system",
diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake
index 9150caad1..ea35d8182 100644
--- a/ports/boost-log/portfile.cmake
+++ b/ports/boost-log/portfile.cmake
@@ -21,7 +21,10 @@ string(REPLACE
     _contents "${_contents}")

 file(WRITE ${SOURCE_PATH}/build/log-arch-config.jam "${_contents}")

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-log requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-log/vcpkg.json b/ports/boost-log/vcpkg.json
index 29d819e03..8c4752f7f 100644
--- a/ports/boost-log/vcpkg.json
+++ b/ports/boost-log/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "boost-log",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost log module",
   "homepage": "https://github.com/boostorg/log",
   "supports": "!uwp & !emscripten",
@@ -14,7 +15,10 @@
     "boost-assert",
     "boost-atomic",
     "boost-bind",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-compatibility",
     "boost-config",
     "boost-container",
@@ -39,7 +43,10 @@
       "platform": "!uwp"
     },
     "boost-math",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-move",
     "boost-mpl",
     "boost-optional",
diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake
index b25655241..b5a1f2b39 100644
--- a/ports/boost-math/portfile.cmake
+++ b/ports/boost-math/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-math requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-math/vcpkg.json b/ports/boost-math/vcpkg.json
index 023e46369..bce6096a2 100644
--- a/ports/boost-math/vcpkg.json
+++ b/ports/boost-math/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "boost-math",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost math module",
   "homepage": "https://github.com/boostorg/math",
   "dependencies": [
@@ -8,7 +9,10 @@
     "boost-array",
     "boost-assert",
     "boost-atomic",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-compatibility",
     "boost-concept-check",
     "boost-config",
@@ -18,7 +22,10 @@
     "boost-integer",
     "boost-lambda",
     "boost-lexical-cast",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-mp11",
     "boost-mpl",
     "boost-predef",
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake
index cd97df9e9..3acc75afd 100644
--- a/ports/boost-modular-build-helper/boost-modular-build.cmake
+++ b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -1,3 +1,6 @@
+get_filename_component(BOOST_BUILD_INSTALLED_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY)

+get_filename_component(BOOST_BUILD_INSTALLED_DIR "${BOOST_BUILD_INSTALLED_DIR}" DIRECTORY)

+

 function(boost_modular_build)

     cmake_parse_arguments(_bm "" "SOURCE_PATH;BOOST_CMAKE_FRAGMENT" "" ${ARGN})

 

@@ -16,38 +19,7 @@ function(boost_modular_build)
         include(${_bm_BOOST_CMAKE_FRAGMENT})

     endif()

 

-    # Todo: this serves too similar a purpose as vcpkg_find_acquire_program()

-    if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")

-        if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")

-            set(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../arm64-linux/tools/boost-build")

-        else()

-            set(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../x64-linux/tools/boost-build")

-        endif()

-    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "armv7l")

-        set(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../arm-linux/tools/boost-build")

-    elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW")

-        get_filename_component(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../x86-windows/tools/boost-build" ABSOLUTE)

-    elseif(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "s390x" AND CMAKE_HOST_WIN32)

-        get_filename_component(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../x86-windows/tools/boost-build" ABSOLUTE)

-    else()

-        set(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/tools/boost-build")

-    endif()

-

-    if(NOT EXISTS "${BOOST_BUILD_PATH}")

-        if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")

-            if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")

-                message(FATAL_ERROR "The arm64 boost-build tools must be installed to build arm64 for Linux. Please run `vcpkg install boost-build:arm64-linux`.")

-            else()

-                message(FATAL_ERROR "The x64 boost-build tools must be installed to build arm64 for Linux. Please run `vcpkg install boost-build:x64-linux`.")

-            endif()

-        else()

-            if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "armv7l")

-                message(FATAL_ERROR "The arm boost-build tools must be installed to build arm64 for Linux. Please run `vcpkg install boost-build:arm-linux`.")

-            else()

-                message(FATAL_ERROR "The x86 boost-build tools must be installed to build for non-x86/x64 platforms. Please run `vcpkg install boost-build:x86-windows`.")

-            endif()

-        endif()

-    endif()

+    set(BOOST_BUILD_PATH "${BOOST_BUILD_INSTALLED_DIR}/tools/boost-build")

 

     if(EXISTS "${BOOST_BUILD_PATH}/b2.exe")

         set(B2_EXE "${BOOST_BUILD_PATH}/b2.exe")

@@ -61,7 +33,7 @@ function(boost_modular_build)
         list(APPEND B2_OPTIONS windows-api=store)

     endif()

 

-    set(_bm_DIR ${CURRENT_INSTALLED_DIR}/share/boost-build)

+    set(_bm_DIR ${BOOST_BUILD_INSTALLED_DIR}/share/boost-build)

 

     if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

         set(BOOST_LIB_PREFIX)

@@ -91,8 +63,6 @@ function(boost_modular_build)
 

     if(EXISTS "${_bm_SOURCE_PATH}/build/Jamfile.v2")

         file(READ ${_bm_SOURCE_PATH}/build/Jamfile.v2 _contents)

-        #string(REPLACE "import ../../predef/check/predef" "import predef/check/predef" _contents "${_contents}")

-        #string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}")

         string(REGEX REPLACE

             "\.\./\.\./([^/ ]+)/build//(boost_[^/ ]+)"

             "/boost/\\1//\\2"

@@ -103,13 +73,6 @@ function(boost_modular_build)
         file(WRITE ${_bm_SOURCE_PATH}/build/Jamfile.v2 "${_contents}")

     endif()

 

-    # if(EXISTS "${CURRENT_INSTALLED_DIR}/share/boost-config/checks")

-    #     file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${_bm_SOURCE_PATH}/build/config")

-    # endif()

-    # if(EXISTS "${CURRENT_INSTALLED_DIR}/share/boost-predef/check")

-    #     file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-predef/check" DESTINATION "${_bm_SOURCE_PATH}/build/predef")

-    # endif()

-    

     function(unix_build BOOST_LIB_SUFFIX BUILD_TYPE BUILD_LIB_PATH)

         message(STATUS "Building ${BUILD_TYPE}...")

         set(BOOST_LIB_SUFFIX ${BOOST_LIB_SUFFIX})

@@ -122,7 +85,7 @@ function(boost_modular_build)
             list(APPEND configure_option "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}")

         endif()

         vcpkg_configure_cmake(

-            SOURCE_PATH ${CURRENT_INSTALLED_DIR}/share/boost-build

+            SOURCE_PATH ${BOOST_BUILD_INSTALLED_DIR}/share/boost-build

             PREFER_NINJA

             OPTIONS

                 "-DPORT=${PORT}"

@@ -159,7 +122,7 @@ function(boost_modular_build)
             message(FATAL_ERROR "No libraries were produced. This indicates a failure while building the boost library.")

         endif()

 

-        file(INSTALL ${CURRENT_INSTALLED_DIR}/share/boost-build/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})

+        configure_file(${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage COPYONLY)

         return()

     endif()

 

@@ -471,5 +434,5 @@ function(boost_modular_build)
     endif()

 

     vcpkg_copy_pdbs()

-    file(INSTALL ${CURRENT_INSTALLED_DIR}/share/boost-build/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})

+    configure_file(${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage COPYONLY)

 endfunction()

diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json
index 78059e291..5ac7e0512 100644
--- a/ports/boost-modular-build-helper/vcpkg.json
+++ b/ports/boost-modular-build-helper/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "boost-modular-build-helper",
   "version-string": "1.75.0",
-  "port-version": 7,
+  "port-version": 8,
   "dependencies": [
+    "boost-build",
     "boost-uninstall"
   ]
 }
diff --git a/ports/boost-mpi/portfile.cmake b/ports/boost-mpi/portfile.cmake
index 49f8528b5..ec27ec0b2 100644
--- a/ports/boost-mpi/portfile.cmake
+++ b/ports/boost-mpi/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-mpi requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-mpi/vcpkg.json b/ports/boost-mpi/vcpkg.json
index 9233a43c0..36f924a6a 100644
--- a/ports/boost-mpi/vcpkg.json
+++ b/ports/boost-mpi/vcpkg.json
@@ -1,11 +1,15 @@
 {
   "name": "boost-mpi",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost mpi module",
   "homepage": "https://github.com/boostorg/mpi",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-compatibility",
     "boost-config",
     "boost-core",
@@ -16,7 +20,10 @@
     "boost-iterator",
     "boost-lexical-cast",
     "boost-math",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-mpl",
     "boost-optional",
     {
diff --git a/ports/boost-nowide/portfile.cmake b/ports/boost-nowide/portfile.cmake
index 6efc96b71..b4fc82d51 100644
--- a/ports/boost-nowide/portfile.cmake
+++ b/ports/boost-nowide/portfile.cmake
@@ -15,7 +15,10 @@ string(REPLACE "check-target-builds ../config//lfs_support" "check-target-builds
 file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")

 file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")

 file(COPY "${SOURCE_PATH}/config/check_lfs_support.cpp" "${SOURCE_PATH}/config/check_movable_fstreams.cpp" DESTINATION "${SOURCE_PATH}/build/config")

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-nowide requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(

     SOURCE_PATH ${SOURCE_PATH}

     BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"

diff --git a/ports/boost-nowide/vcpkg.json b/ports/boost-nowide/vcpkg.json
index 234dc681c..f23a27d27 100644
--- a/ports/boost-nowide/vcpkg.json
+++ b/ports/boost-nowide/vcpkg.json
@@ -1,16 +1,23 @@
 {
   "name": "boost-nowide",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost nowide module",
   "homepage": "https://github.com/boostorg/nowide",
   "dependencies": [
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     {
       "name": "boost-filesystem",
       "platform": "!uwp"
     },
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-vcpkg-helpers"
   ]
 }
diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake
index 87f2f2b6e..4b1d8bd07 100644
--- a/ports/boost-program-options/portfile.cmake
+++ b/ports/boost-program-options/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-program-options requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-program-options/vcpkg.json b/ports/boost-program-options/vcpkg.json
index 2846e5610..ebad7f23e 100644
--- a/ports/boost-program-options/vcpkg.json
+++ b/ports/boost-program-options/vcpkg.json
@@ -1,12 +1,16 @@
 {
   "name": "boost-program-options",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost program_options module",
   "homepage": "https://github.com/boostorg/program_options",
   "dependencies": [
     "boost-any",
     "boost-bind",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-compatibility",
     "boost-config",
     "boost-core",
@@ -15,7 +19,10 @@
     "boost-iterator",
     "boost-lexical-cast",
     "boost-math",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-smart-ptr",
     "boost-static-assert",
     "boost-throw-exception",
diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake
index 92fa8d184..9293a86f8 100644
--- a/ports/boost-python/portfile.cmake
+++ b/ports/boost-python/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-python requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(

     SOURCE_PATH ${SOURCE_PATH}

     BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"

diff --git a/ports/boost-python/vcpkg.json b/ports/boost-python/vcpkg.json
index 942366f92..ae32d8dd6 100644
--- a/ports/boost-python/vcpkg.json
+++ b/ports/boost-python/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "boost-python",
   "version-string": "1.75.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Boost python module",
   "homepage": "https://github.com/boostorg/python",
   "supports": "!uwp & !(arm & windows) & !emscripten",
diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake
index 008da4e3d..fe0763aa0 100644
--- a/ports/boost-random/portfile.cmake
+++ b/ports/boost-random/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-random requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-random/vcpkg.json b/ports/boost-random/vcpkg.json
index cb45186a9..5a67fca81 100644
--- a/ports/boost-random/vcpkg.json
+++ b/ports/boost-random/vcpkg.json
@@ -1,11 +1,15 @@
 {
   "name": "boost-random",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost random module",
   "homepage": "https://github.com/boostorg/random",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-compatibility",
     "boost-config",
     "boost-core",
@@ -14,7 +18,10 @@
     "boost-integer",
     "boost-io",
     "boost-math",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-multiprecision",
     "boost-range",
     "boost-static-assert",
diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake
index 92be13446..aa7afe238 100644
--- a/ports/boost-regex/portfile.cmake
+++ b/ports/boost-regex/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-regex requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(

     SOURCE_PATH ${SOURCE_PATH}

     BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"

diff --git a/ports/boost-regex/vcpkg.json b/ports/boost-regex/vcpkg.json
index ab241a824..a15cc3553 100644
--- a/ports/boost-regex/vcpkg.json
+++ b/ports/boost-regex/vcpkg.json
@@ -1,11 +1,15 @@
 {
   "name": "boost-regex",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost regex module",
   "homepage": "https://github.com/boostorg/regex",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-compatibility",
     "boost-concept-check",
     "boost-config",
@@ -14,7 +18,10 @@
     "boost-detail",
     "boost-integer",
     "boost-iterator",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-mpl",
     "boost-predef",
     "boost-smart-ptr",
diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake
index ef6fde24c..27609925f 100644
--- a/ports/boost-serialization/portfile.cmake
+++ b/ports/boost-serialization/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-serialization requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-serialization/vcpkg.json b/ports/boost-serialization/vcpkg.json
index c0d201704..ffaea91bb 100644
--- a/ports/boost-serialization/vcpkg.json
+++ b/ports/boost-serialization/vcpkg.json
@@ -1,12 +1,16 @@
 {
   "name": "boost-serialization",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost serialization module",
   "homepage": "https://github.com/boostorg/serialization",
   "dependencies": [
     "boost-array",
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-compatibility",
     "boost-config",
     "boost-core",
@@ -15,7 +19,10 @@
     "boost-integer",
     "boost-io",
     "boost-iterator",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-move",
     "boost-mpl",
     "boost-optional",
diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake
index adfc21623..11f5f7068 100644
--- a/ports/boost-stacktrace/portfile.cmake
+++ b/ports/boost-stacktrace/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-stacktrace requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-stacktrace/vcpkg.json b/ports/boost-stacktrace/vcpkg.json
index f30cc6119..870b8dd7d 100644
--- a/ports/boost-stacktrace/vcpkg.json
+++ b/ports/boost-stacktrace/vcpkg.json
@@ -1,16 +1,23 @@
 {
   "name": "boost-stacktrace",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost stacktrace module",
   "homepage": "https://github.com/boostorg/stacktrace",
   "supports": "!uwp",
   "dependencies": [
     "boost-array",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-container-hash",
     "boost-core",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-predef",
     "boost-static-assert",
     "boost-type-traits",
diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake
index bf6f9ed98..e26a02be7 100644
--- a/ports/boost-system/portfile.cmake
+++ b/ports/boost-system/portfile.cmake
@@ -10,7 +10,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-system requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-system/vcpkg.json b/ports/boost-system/vcpkg.json
index df0fe9d46..f311f0c8b 100644
--- a/ports/boost-system/vcpkg.json
+++ b/ports/boost-system/vcpkg.json
@@ -1,13 +1,20 @@
 {
   "name": "boost-system",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost system module",
   "homepage": "https://github.com/boostorg/system",
   "dependencies": [
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-integer",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-vcpkg-helpers",
     "boost-winapi"
   ]
diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake
index d9dcf4cf7..858ec62b7 100644
--- a/ports/boost-test/portfile.cmake
+++ b/ports/boost-test/portfile.cmake
@@ -13,7 +13,10 @@ string(REPLACE "import ../../predef/check/predef" "import predef/check/predef" _
 file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")

 file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-predef/check" DESTINATION "${SOURCE_PATH}/build/predef")

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-test requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-test/vcpkg.json b/ports/boost-test/vcpkg.json
index 886dfd4da..6ae0847b0 100644
--- a/ports/boost-test/vcpkg.json
+++ b/ports/boost-test/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "boost-test",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost test module",
   "homepage": "https://github.com/boostorg/test",
   "supports": "!uwp",
@@ -8,7 +9,10 @@
     "boost-algorithm",
     "boost-assert",
     "boost-bind",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-compatibility",
     "boost-config",
     "boost-core",
@@ -18,7 +22,10 @@
     "boost-integer",
     "boost-io",
     "boost-iterator",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-mpl",
     "boost-numeric-conversion",
     "boost-optional",
diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake
index 17c620ec4..f16abdf67 100644
--- a/ports/boost-thread/portfile.cmake
+++ b/ports/boost-thread/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-thread requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(

     SOURCE_PATH ${SOURCE_PATH}

     BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"

diff --git a/ports/boost-thread/vcpkg.json b/ports/boost-thread/vcpkg.json
index 5cc1d3b32..be64e494b 100644
--- a/ports/boost-thread/vcpkg.json
+++ b/ports/boost-thread/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "boost-thread",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost thread module",
   "homepage": "https://github.com/boostorg/thread",
   "dependencies": [
@@ -8,7 +9,10 @@
     "boost-assert",
     "boost-atomic",
     "boost-bind",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-chrono",
     "boost-concept-check",
     "boost-config",
@@ -24,7 +28,10 @@
     "boost-io",
     "boost-lexical-cast",
     "boost-math",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-move",
     "boost-optional",
     "boost-predef",
diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake
index 393e91ba5..0cc16578d 100644
--- a/ports/boost-timer/portfile.cmake
+++ b/ports/boost-timer/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-timer requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-timer/vcpkg.json b/ports/boost-timer/vcpkg.json
index 2f9944cbb..82da293c2 100644
--- a/ports/boost-timer/vcpkg.json
+++ b/ports/boost-timer/vcpkg.json
@@ -1,17 +1,24 @@
 {
   "name": "boost-timer",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost timer module",
   "homepage": "https://github.com/boostorg/timer",
   "dependencies": [
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-chrono",
     "boost-compatibility",
     "boost-config",
     "boost-core",
     "boost-integer",
     "boost-io",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-predef",
     "boost-system",
     "boost-throw-exception",
diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake
index 77227e81f..339449d5f 100644
--- a/ports/boost-type-erasure/portfile.cmake
+++ b/ports/boost-type-erasure/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-type-erasure requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-type-erasure/vcpkg.json b/ports/boost-type-erasure/vcpkg.json
index 2af0eddf8..1ea175c18 100644
--- a/ports/boost-type-erasure/vcpkg.json
+++ b/ports/boost-type-erasure/vcpkg.json
@@ -1,16 +1,23 @@
 {
   "name": "boost-type-erasure",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost type_erasure module",
   "homepage": "https://github.com/boostorg/type_erasure",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-detail",
     "boost-fusion",
     "boost-iterator",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-mp11",
     "boost-mpl",
     "boost-preprocessor",
diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake
index 91659c6ae..1f6f1765a 100644
--- a/ports/boost-wave/portfile.cmake
+++ b/ports/boost-wave/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master

 )

 

-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)

+    message(FATAL_ERROR "boost-wave requires a newer version of vcpkg in order to build.")

+endif()

+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)

 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-wave/vcpkg.json b/ports/boost-wave/vcpkg.json
index 556c1449b..8be600478 100644
--- a/ports/boost-wave/vcpkg.json
+++ b/ports/boost-wave/vcpkg.json
@@ -1,12 +1,16 @@
 {
   "name": "boost-wave",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost wave module",
   "homepage": "https://github.com/boostorg/wave",
   "supports": "!uwp",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-concept-check",
     "boost-config",
     "boost-core",
@@ -19,7 +23,10 @@
     "boost-iterator",
     "boost-lexical-cast",
     "boost-math",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-mpl",
     "boost-multi-index",
     "boost-optional",
diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake
index e278fde14..1c40312af 100644
--- a/ports/caf/portfile.cmake
+++ b/ports/caf/portfile.cmake
@@ -1,28 +1,13 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-set(CAF_TOOL_PATH )
-if (VCPKG_TARGET_IS_WINDOWS AND (TRIPLET_SYSTEM_ARCH STREQUAL arm OR TRIPLET_SYSTEM_ARCH STREQUAL arm64))
-    if (EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/caf-generate-enum-strings.exe)
-        set(CAF_TOOL_PATH ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/)
-    elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows-static/tools/caf-generate-enum-strings.exe)
-        set(CAF_TOOL_PATH ${CURRENT_INSTALLED_DIR}/../x86-windows-static/tools/)
-    elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x64-windows/tools/caf-generate-enum-strings.exe AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
-        set(CAF_TOOL_PATH ${CURRENT_INSTALLED_DIR}/../x64-windows/tools/)
-    elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x64-windows-static/tools/caf-generate-enum-strings.exe AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
-        set(CAF_TOOL_PATH ${CURRENT_INSTALLED_DIR}/../x64-windows-static/tools/)
-    else()
-        message(FATAL_ERROR "Since caf needs to run the built-in executable, please install caf:x86-windows or caf:x64-windows first.")
-    endif()
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO actor-framework/actor-framework
     REF f7d4fc7ac679e18ba385f64434f8015c3cea9cb5 # 0.17.6
     SHA512 8b4719c26dfad68eed6f2528263702e42f9865bb7a9f2d40909dc6c3fc20bb7259fe44a5f89390ba714c7f9359db2d171ff44685641962c24a70f4e2aa3f3f65
     HEAD_REF master
-	PATCHES
-		openssl-version-override.patch
+    PATCHES
+        openssl-version-override.patch
 )
 
 vcpkg_configure_cmake(
@@ -42,7 +27,7 @@ vcpkg_configure_cmake(
         -DCAF_NO_OPENSSL=OFF
         -DCAF_NO_CURL_EXAMPLES=ON
         -DCAF_OPENSSL_VERSION_OVERRIDE=ON
-        -DCAF_TOOL_PATH=${CAF_TOOL_PATH}
+        -DCAF_ENABLE_UTILITY_TARGETS=OFF
 )
 
 vcpkg_install_cmake()
diff --git a/ports/caf/vcpkg.json b/ports/caf/vcpkg.json
index c0dad8bd0..fea50a3a5 100644
--- a/ports/caf/vcpkg.json
+++ b/ports/caf/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "caf",
   "version-string": "0.17.6",
-  "port-version": 1,
+  "port-version": 2,
   "description": "an open source C++11 actor model implementation featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.",
   "homepage": "https://github.com/actor-framework/actor-framework",
   "dependencies": [
diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake
index 356387488..b60a22cb8 100644
--- a/ports/clapack/portfile.cmake
+++ b/ports/clapack/portfile.cmake
@@ -20,11 +20,11 @@ vcpkg_extract_source_archive_ex(
       support-uwp.patch
 )
 
-if (VCPKG_TARGET_IS_UWP)
-    if (NOT EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/arithchk.exe)
-        message(FATAL_ERROR "Please install ${PORT}:x86-windows first.")
-    endif()
-    set(ARITHCHK_PATH ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/arithchk.exe)
+if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET)
+  set(ARITHCHK_PATH ${CURRENT_HOST_INSTALLED_DIR}/tools/clapack/arithchk${VCPKG_HOST_EXECUTABLE_SUFFIX})
+  if(NOT EXISTS "${ARITHCHK_PATH}")
+    message(FATAL_ERROR "Expected ${ARITHCHK_PATH} to exist.")
+  endif()
 endif()
 
 vcpkg_configure_cmake(
diff --git a/ports/clapack/support-uwp.patch b/ports/clapack/support-uwp.patch
index 3cbb750be..eeb6bc3d5 100644
--- a/ports/clapack/support-uwp.patch
+++ b/ports/clapack/support-uwp.patch
@@ -41,9 +41,9 @@ index 094614a..e5b40ab 100644
          ARCHIVE DESTINATION lib
          INCLUDES DESTINATION include)
  
-+install(TARGETS arithchk
-+    RUNTIME DESTINATION tools
-+)
++if (NOT ARITHCHK_PATH)
++    install(TARGETS arithchk RUNTIME DESTINATION tools/clapack)
++endif()
 \ No newline at end of file
 diff --git a/F2CLIBS/libf2c/inquire.c b/F2CLIBS/libf2c/inquire.c
 index 5936a67..4846d41 100644
diff --git a/ports/clapack/vcpkg.json b/ports/clapack/vcpkg.json
index 7d7c90a41..8450cd3db 100644
--- a/ports/clapack/vcpkg.json
+++ b/ports/clapack/vcpkg.json
@@ -1,10 +1,14 @@
 {
   "name": "clapack",
   "version-string": "3.2.1",
-  "port-version": 16,
+  "port-version": 17,
   "description": "CLAPACK (f2c'ed version of LAPACK)",
   "homepage": "https://www.netlib.org/clapack",
   "dependencies": [
-    "blas"
+    "blas",
+    {
+      "name": "clapack",
+      "host": true
+    }
   ]
 }
diff --git a/ports/google-cloud-cpp/disable-benchmarks.patch b/ports/google-cloud-cpp/disable-benchmarks.patch
new file mode 100644
index 000000000..966cb1733
--- /dev/null
+++ b/ports/google-cloud-cpp/disable-benchmarks.patch
@@ -0,0 +1,43 @@
+diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt

+index d68ae2a..99ec4c2 100644

+--- a/generator/CMakeLists.txt

++++ b/generator/CMakeLists.txt

+@@ -150,7 +150,7 @@ function (google_cloud_cpp_generator_define_tests)

+     endforeach ()

+ endfunction ()

+ 

+-add_subdirectory(integration_tests)

++# add_subdirectory(integration_tests)

+ 

+ # Only define the tests if testing is enabled. Package maintainers may not want

+ # to build all the tests everytime they create a new package or when the package

+diff --git a/google/cloud/CMakeLists.txt b/google/cloud/CMakeLists.txt

+index 09a4b58..9c85374 100644

+--- a/google/cloud/CMakeLists.txt

++++ b/google/cloud/CMakeLists.txt

+@@ -548,5 +548,5 @@ if (GOOGLE_CLOUD_CPP_ENABLE_GRPC)

+         DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/google_cloud_cpp_grpc_utils"

+         COMPONENT google_cloud_cpp_development)

+ 

+-    add_subdirectory(samples)

++    #add_subdirectory(samples)

+ endif ()

+diff --git a/google/cloud/bigtable/CMakeLists.txt b/google/cloud/bigtable/CMakeLists.txt

+index 399c84f..d58c910 100644

+--- a/google/cloud/bigtable/CMakeLists.txt

++++ b/google/cloud/bigtable/CMakeLists.txt

+@@ -323,12 +323,12 @@ if (BUILD_TESTING)

+     add_subdirectory(tests)

+ endif ()

+ 

+-add_subdirectory(benchmarks)

++# add_subdirectory(benchmarks)

+ 

+ if (GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)

+     # The examples are more readable if we use exceptions for error handling. We

+     # had to tradeoff readability vs. "making them compile everywhere".

+-    add_subdirectory(examples)

++    #add_subdirectory(examples)

+ endif (GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)

+ 

+ # Export the CMake targets to make it easy to create configuration files.

diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake
index 0da849f0d..f597e30ae 100644
--- a/ports/google-cloud-cpp/portfile.cmake
+++ b/ports/google-cloud-cpp/portfile.cmake
@@ -8,8 +8,12 @@ vcpkg_from_github(
     REF v1.25.0
     SHA512 db1803b9de38028a171d3b295b85da5dd36f150c78f2ec523f24eb67998c27d06584aa26e572cab8508841cb469c980304501b87f4157a8020f85bc733f968b5
     HEAD_REF master
+    PATCHES
+        disable-benchmarks.patch
 )
 
+vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc")
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -17,10 +21,11 @@ vcpkg_configure_cmake(
     OPTIONS
         -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF
         -DGOOGLE_CLOUD_CPP_ENABLE_WERROR=OFF
+        -DGOOGLE_CLOUD_CPP_ENABLE_CCACHE=OFF
         -DBUILD_TESTING=OFF
 )
 
-vcpkg_install_cmake(ADD_BIN_TO_PATH)
+vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share)
diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json
index 4c9f4791c..07eb59b4f 100644
--- a/ports/google-cloud-cpp/vcpkg.json
+++ b/ports/google-cloud-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "google-cloud-cpp",
   "version": "1.25.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "C++ Client Libraries for Google Cloud Platform APIs.",
   "homepage": "https://github.com/googleapis/google-cloud-cpp",
   "license": "Apache-2.0",
@@ -15,6 +15,10 @@
         "ssl"
       ]
     },
+    {
+      "name": "grpc",
+      "host": true
+    },
     "grpc",
     "nlohmann-json"
   ]
diff --git a/ports/grpc/gRPCTargets-vcpkg-tools.cmake b/ports/grpc/gRPCTargets-vcpkg-tools.cmake
new file mode 100644
index 000000000..08e3ee3af
--- /dev/null
+++ b/ports/grpc/gRPCTargets-vcpkg-tools.cmake
@@ -0,0 +1,10 @@
+file(GLOB GRPC_PLUGINS "${_IMPORT_PREFIX}/../@HOST_TRIPLET@/tools/grpc/grpc_*_plugin*")

+

+foreach(PLUGIN ${GRPC_PLUGINS})

+  get_filename_component(PLUGIN_NAME "${PLUGIN}" NAME_WE)

+  add_executable(gRPC::${PLUGIN_NAME} IMPORTED)

+  set_property(TARGET gRPC::${PLUGIN_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)

+  set_target_properties(gRPC::${PLUGIN_NAME} PROPERTIES

+    IMPORTED_LOCATION_RELEASE "${PLUGIN}"

+  )

+endforeach()

diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
index 648b41b61..8102f4492 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -21,10 +21,11 @@ vcpkg_from_github(
         00012-fix-use-cxx17.patch
 )
 
-if((NOT VCPKG_TARGET_IS_LINUX AND NOT VCPKG_TARGET_IS_OSX) AND (VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64"))
-    set(gRPC_BUILD_CODEGEN OFF)
-else()
+if(TARGET_TRIPLET STREQUAL HOST_TRIPLET)
     set(gRPC_BUILD_CODEGEN ON)
+else()
+    set(gRPC_BUILD_CODEGEN OFF)
+    vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc")
 endif()
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" gRPC_MSVC_STATIC_RUNTIME)
@@ -62,13 +63,15 @@ vcpkg_configure_cmake(
         -DgRPC_INSTALL_BINDIR:STRING=bin
         -DgRPC_INSTALL_LIBDIR:STRING=lib
         -DgRPC_INSTALL_INCLUDEDIR:STRING=include
-        -DgRPC_INSTALL_CMAKEDIR:STRING=share/gRPC
+        -DgRPC_INSTALL_CMAKEDIR:STRING=share/grpc
         -DgRPC_BUILD_CODEGEN=${gRPC_BUILD_CODEGEN}
+        -D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}
+        -DPROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}
 )
 
 vcpkg_install_cmake(ADD_BIN_TO_PATH)
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/gRPC TARGET_PATH share/gRPC)
+vcpkg_fixup_cmake_targets()
 
 if (gRPC_BUILD_CODEGEN)
     vcpkg_copy_tools(
@@ -82,6 +85,8 @@ if (gRPC_BUILD_CODEGEN)
             grpc_cpp_plugin
             grpc_ruby_plugin
     )
+else()
+    configure_file(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets-vcpkg-tools.cmake ${CURRENT_PACKAGES_DIR}/share/grpc/gRPCTargets-vcpkg-tools.cmake @ONLY)
 endif()
 
 # Ignore the C# extension DLL in bin/
diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json
index 0a180bea0..a639cdccb 100644
--- a/ports/grpc/vcpkg.json
+++ b/ports/grpc/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "grpc",
   "version-string": "1.33.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "An RPC library and framework",
   "homepage": "https://github.com/grpc/grpc",
   "dependencies": [
@@ -10,8 +10,16 @@
       "name": "c-ares",
       "platform": "!uwp"
     },
+    {
+      "name": "grpc",
+      "host": true
+    },
     "openssl",
     "protobuf",
+    {
+      "name": "protobuf",
+      "host": true
+    },
     "re2",
     "upb",
     "zlib"
diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake
index e603d4af5..e0880683a 100644
--- a/ports/proj4/portfile.cmake
+++ b/ports/proj4/portfile.cmake
@@ -38,25 +38,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()
 
 if ("database" IN_LIST FEATURES)
-    if (VCPKG_TARGET_IS_WINDOWS)
-        set(BIN_SUFFIX .exe)
-        if (EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/sqlite3.exe)
-            set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/../x86-windows/tools)
-        elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows-static/tools/sqlite3.exe)
-            set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/../x86-windows-static/tools)
-        elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x64-windows/tools/sqlite3.exe AND (NOT CMAKE_HOST_SYSTEM_PROCESSOR OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64"))
-            set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/../x64-windows/tools)
-        elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x64-windows-static/tools/sqlite3.exe AND (NOT CMAKE_HOST_SYSTEM_PROCESSOR OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64"))
-            set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/../x64-windows-static/tools)
-        elseif (NOT TRIPLET_SYSTEM_ARCH STREQUAL "arm" AND EXISTS ${CURRENT_INSTALLED_DIR}/tools/sqlite3.exe)
-            set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/tools)
-        else()
-            message(FATAL_ERROR "Proj4 database need to install sqlite3[tool]:x86-windows first.")
-        endif()
-    else()
-        set(BIN_SUFFIX)
-        set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/tools)
-    endif()
+    set(EXE_SQLITE3 ${CURRENT_HOST_INSTALLED_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX})
 endif()
 
 vcpkg_configure_cmake(
@@ -67,7 +49,7 @@ vcpkg_configure_cmake(
     -DPROJ_INCLUDE_SUBDIR=include
     -DPROJ_DATA_SUBDIR=share/${PORT}
     -DBUILD_TESTING=OFF
-    -DEXE_SQLITE3=${SQLITE3_BIN_PATH}/sqlite3${BIN_SUFFIX}
+    -DEXE_SQLITE3=${EXE_SQLITE3}
 )
 
 vcpkg_install_cmake()
diff --git a/ports/proj4/vcpkg.json b/ports/proj4/vcpkg.json
index 629feec02..a6c8f8b43 100644
--- a/ports/proj4/vcpkg.json
+++ b/ports/proj4/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "proj4",
   "version-string": "7.2.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "PROJ.4 library for cartographic projections",
   "homepage": "https://github.com/OSGeo/PROJ",
   "dependencies": [
@@ -20,10 +20,10 @@
       "dependencies": [
         {
           "name": "sqlite3",
+          "host": true,
           "features": [
             "tool"
-          ],
-          "platform": "!uwp & !arm"
+          ]
         }
       ]
     },
diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake
index a79a34ef8..1104b9c06 100644
--- a/ports/protobuf/portfile.cmake
+++ b/ports/protobuf/portfile.cmake
@@ -9,34 +9,20 @@ vcpkg_from_github(
         fix-default-proto-file-path.patch
 )
 
-if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
-    set(protobuf_BUILD_PROTOC_BINARIES OFF)
-elseif(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_IS_MINGW AND NOT (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP))
-    set(protobuf_BUILD_PROTOC_BINARIES OFF)
-else()
-    set(protobuf_BUILD_PROTOC_BINARIES ON)
-endif()
-
-if(NOT protobuf_BUILD_PROTOC_BINARIES AND NOT EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/protobuf)
-    message(FATAL_ERROR "Cross-targetting protobuf requires the x86-windows protoc to be available. Please install protobuf:x86-windows first.")
-endif()
+string(COMPARE EQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" protobuf_BUILD_PROTOC_BINARIES)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" protobuf_BUILD_SHARED_LIBS)
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" protobuf_MSVC_STATIC_RUNTIME)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-  set(VCPKG_BUILD_SHARED_LIBS ON)
-else()
-  set(VCPKG_BUILD_SHARED_LIBS OFF)
-endif()
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    zlib protobuf_WITH_ZLIB
+)
 
-if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
-  set(VCPKG_BUILD_STATIC_CRT OFF)
+if(VCPKG_TARGET_IS_UWP)
+    set(protobuf_BUILD_LIBPROTOC OFF)
 else()
-  set(VCPKG_BUILD_STATIC_CRT ON)
+    set(protobuf_BUILD_LIBPROTOC ON)
 endif()
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-	zlib	protobuf_WITH_ZLIB
-)
-
 if (VCPKG_DOWNLOAD_MODE)
     # download PKGCONFIG in download mode which is used in `vcpkg_fixup_pkgconfig()` at the end of this script.
     # download it here because `vcpkg_configure_cmake()` halts execution in download mode when running configure process.
@@ -47,12 +33,13 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/cmake
     PREFER_NINJA
     OPTIONS
-        -Dprotobuf_BUILD_SHARED_LIBS=${VCPKG_BUILD_SHARED_LIBS}
-        -Dprotobuf_MSVC_STATIC_RUNTIME=${VCPKG_BUILD_STATIC_CRT}
+        -Dprotobuf_BUILD_SHARED_LIBS=${protobuf_BUILD_SHARED_LIBS}
+        -Dprotobuf_MSVC_STATIC_RUNTIME=${protobuf_MSVC_STATIC_RUNTIME}
         -Dprotobuf_BUILD_TESTS=OFF
         -DCMAKE_INSTALL_CMAKEDIR:STRING=share/protobuf
         -Dprotobuf_BUILD_PROTOC_BINARIES=${protobuf_BUILD_PROTOC_BINARIES}
-         ${FEATURE_OPTIONS}
+        -Dprotobuf_BUILD_LIBPROTOC=${protobuf_BUILD_LIBPROTOC}
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_install_cmake()
@@ -70,17 +57,11 @@ endfunction()
 
 protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/include)
 
-if(CMAKE_HOST_WIN32)
-    set(EXECUTABLE_SUFFIX ".exe")
-else()
-    set(EXECUTABLE_SUFFIX "")
-endif()
-
 if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-	vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-release.cmake
-		"\${_IMPORT_PREFIX}/bin/protoc${EXECUTABLE_SUFFIX}"
-		"\${_IMPORT_PREFIX}/tools/protobuf/protoc${EXECUTABLE_SUFFIX}"
-)
+    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-release.cmake
+        "\${_IMPORT_PREFIX}/bin/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
+        "\${_IMPORT_PREFIX}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
+    )
 endif()
 
 if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
@@ -92,35 +73,26 @@ endif()
 
 protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/share)
 
-if(CMAKE_HOST_WIN32)
-    if(protobuf_BUILD_PROTOC_BINARIES)
-        vcpkg_copy_tools(TOOL_NAMES protoc)
-    else()
-        file(COPY ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
-    endif()
-
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin)
-        protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin)
+if(protobuf_BUILD_PROTOC_BINARIES)
+    if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
+        vcpkg_copy_tools(TOOL_NAMES protoc AUTO_CLEAN)
     else()
-        protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin/protoc.exe)
-        protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin/protoc.exe)
+        vcpkg_copy_tools(TOOL_NAMES protoc protoc-3.14.0.0 AUTO_CLEAN)
     endif()
 else()
-    file(GLOB EXECUTABLES ${CURRENT_PACKAGES_DIR}/bin/protoc*)
-    foreach(E IN LISTS EXECUTABLES)
-        file(INSTALL ${E} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}
-                PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ)
-    endforeach()
-    protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(COPY ${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
+endif()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin)
+    protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-	vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/google/protobuf/stubs/platform_macros.h
-		"\#endif  // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_"
-		"\#ifndef PROTOBUF_USE_DLLS\n\#define PROTOBUF_USE_DLLS\n\#endif // PROTOBUF_USE_DLLS\n\n\#endif  // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_"
-)
+    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/google/protobuf/stubs/platform_macros.h
+        "\#endif  // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_"
+        "\#ifndef PROTOBUF_USE_DLLS\n\#define PROTOBUF_USE_DLLS\n\#endif // PROTOBUF_USE_DLLS\n\n\#endif  // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_"
+    )
 endif()
 
 vcpkg_copy_pdbs()
@@ -132,10 +104,11 @@ foreach(_package IN LISTS packages)
     endif()
 endforeach()
 
-if(NOT VCPKG_TARGET_IS_WINDOWS)
-    set(SYSTEM_LIBRARIES SYSTEM_LIBRARIES pthread)
+vcpkg_fixup_pkgconfig()
+
+if(NOT protobuf_BUILD_PROTOC_BINARIES)
+    configure_file(${CMAKE_CURRENT_LIST_DIR}/protobuf-targets-vcpkg-protoc.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-targets-vcpkg-protoc.cmake COPYONLY)
 endif()
-vcpkg_fixup_pkgconfig(${SYSTEM_LIBRARIES})
 
 configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY)
-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/protobuf/protobuf-targets-vcpkg-protoc.cmake b/ports/protobuf/protobuf-targets-vcpkg-protoc.cmake
new file mode 100644
index 000000000..245adf560
--- /dev/null
+++ b/ports/protobuf/protobuf-targets-vcpkg-protoc.cmake
@@ -0,0 +1,8 @@
+# Create imported target protobuf::protoc

+add_executable(protobuf::protoc IMPORTED)

+

+# Import target "protobuf::protoc" for configuration "Release"

+set_property(TARGET protobuf::protoc APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)

+set_target_properties(protobuf::protoc PROPERTIES

+    IMPORTED_LOCATION_RELEASE "${Protobuf_PROTOC_EXECUTABLE}"

+)

diff --git a/ports/protobuf/vcpkg-cmake-wrapper.cmake b/ports/protobuf/vcpkg-cmake-wrapper.cmake
index 1a0f683d2..542a16c2b 100644
--- a/ports/protobuf/vcpkg-cmake-wrapper.cmake
+++ b/ports/protobuf/vcpkg-cmake-wrapper.cmake
@@ -10,4 +10,7 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3)
     endif()

     cmake_policy(POP)

 endif()

+

+find_program(Protobuf_PROTOC_EXECUTABLE NAMES protoc PATHS "${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/tools/protobuf" NO_DEFAULT_PATH)

+

 _find_package(${ARGS})

diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json
index fef05b79d..9d38c89fd 100644
--- a/ports/protobuf/vcpkg.json
+++ b/ports/protobuf/vcpkg.json
@@ -1,9 +1,15 @@
 {
   "name": "protobuf",
   "version-string": "3.14.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Protocol Buffers - Google's data interchange format",
   "homepage": "https://github.com/protocolbuffers/protobuf",
+  "dependencies": [
+    {
+      "name": "protobuf",
+      "host": true
+    }
+  ],
   "features": {
     "zlib": {
       "description": "ZLib based features like Gzip streams",
diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
index 6a92bef3f..1ca13c559 100644
--- a/ports/qt5-base/portfile.cmake
+++ b/ports/qt5-base/portfile.cmake
@@ -127,6 +127,7 @@ list(APPEND CORE_OPTIONS
     -system-sqlite
     -system-harfbuzz
     -icu
+    -no-vulkan
     -no-angle)      # Qt does not need to build angle. VCPKG will build angle!
 
 if(QT_OPENSSL_LINK)
diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json
index a582fba66..37e62526c 100644
--- a/ports/qt5-base/vcpkg.json
+++ b/ports/qt5-base/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qt5-base",
   "version-string": "5.15.2",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "dependencies": [