From 134505003bb46e20fbace51ccfb69243fbbc5f82 Mon Sep 17 00:00:00 2001
From: "Stephan T. Lavavej" <stl@microsoft.com>
Date: Fri, 23 Jul 2021 21:05:45 -0700
Subject: [boost] Fix `boost-modular-build.cmake` with VS 2022 17.0 Preview 2
 (#19086)

* Fix boost-modular-build.cmake with VS 2022 17.0 Preview 2.

* Update another version list, noticed by @CaseyCarter.

* Update port-version to 1.

* Run `vcpkg.exe x-add-version --all`.
---
 ports/boost-modular-build-helper/boost-modular-build.cmake | 6 +++++-
 ports/boost-modular-build-helper/vcpkg.json                | 1 +
 versions/b-/boost-modular-build-helper.json                | 5 +++++
 versions/baseline.json                                     | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake
index fecb98651..f8a35a207 100644
--- a/ports/boost-modular-build-helper/boost-modular-build.cmake
+++ b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -300,7 +300,10 @@ function(boost_modular_build)
     endif()
 
     set(MSVC_VERSION)
-    if(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
+    if(VCPKG_PLATFORM_TOOLSET MATCHES "v143")
+        list(APPEND _bm_OPTIONS toolset=msvc)
+        set(MSVC_VERSION 14.3)
+    elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
         list(APPEND _bm_OPTIONS toolset=msvc)
         set(MSVC_VERSION 14.2)
     elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
@@ -410,6 +413,7 @@ function(boost_modular_build)
         string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs
         string(REPLACE "-vc141-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2017 and VS2015 binaries
         string(REPLACE "-vc142-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2019 and VS2015 binaries
+        string(REPLACE "-vc143-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2022 and VS2015 binaries
         string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs
         string(REPLACE "-sgyd-" "-gyd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs
         string(REPLACE "-x32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json
index d7460d8db..192b42066 100644
--- a/ports/boost-modular-build-helper/vcpkg.json
+++ b/ports/boost-modular-build-helper/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "boost-modular-build-helper",
   "version-string": "1.76.0",
+  "port-version": 1,
   "dependencies": [
     "boost-build",
     "boost-uninstall"
diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json
index 7ba71e16e..95199b6d3 100644
--- a/versions/b-/boost-modular-build-helper.json
+++ b/versions/b-/boost-modular-build-helper.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f9cf6243049bf0abf8526fba57702a2122665549",
+      "version-string": "1.76.0",
+      "port-version": 1
+    },
     {
       "git-tree": "e0f858222eaf2c58a7270d10d649bc88e2e149b6",
       "version-string": "1.76.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index b35f9fc19..5692866e8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -746,7 +746,7 @@
     },
     "boost-modular-build-helper": {
       "baseline": "1.76.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-move": {
       "baseline": "1.76.0",
-- 
cgit v1.2.3