From 5786fcb0cb5eb08d1931a230dad9701e7a6c37f0 Mon Sep 17 00:00:00 2001
From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
Date: Sat, 27 Jan 2024 01:43:56 +0800
Subject: [PATCH] Fix conflict (#36119)

---
 ports/boost-modular-build-helper/boost-modular-build.cmake | 4 +---
 ports/boost-modular-build-helper/vcpkg.json                | 1 +
 scripts/boost/generate-ports.ps1                           | 1 +
 versions/b-/boost-modular-build-helper.json                | 5 +++++
 versions/baseline.json                                     | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake
index f21116ec67..0bbd31be82 100644
--- a/ports/boost-modular-build-helper/boost-modular-build.cmake
+++ b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -152,9 +152,7 @@ function(boost_modular_build)
         get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY)
         string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME})
         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(REGEX REPLACE "-vc14[1-9]-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2022 VS2019 VS2017 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 "-gyd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs with python debugging
diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json
index 69876a4deb..059ada2005 100644
--- a/ports/boost-modular-build-helper/vcpkg.json
+++ b/ports/boost-modular-build-helper/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-modular-build-helper",
   "version": "1.84.0",
+  "port-version": 1,
   "description": "Internal vcpkg port used to build Boost libraries",
   "license": "MIT",
   "dependencies": [
diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1
index 2305bc76bf..97f8d1ab95 100644
--- a/scripts/boost/generate-ports.ps1
+++ b/scripts/boost/generate-ports.ps1
@@ -27,6 +27,7 @@ $semverVersion = ($version -replace "(\d+(\.\d+){1,3}).*", "`$1")
 # Clear this array when moving to a new boost version
 $defaultPortVersion = 0
 $portVersions = @{
+    'boost-modular-build-helper' = 1;
 }
 
 function Get-PortVersion {
diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json
index 0cdf56c565..e63b0f4762 100644
--- a/versions/b-/boost-modular-build-helper.json
+++ b/versions/b-/boost-modular-build-helper.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "dc7e88a84383b497c7d9e117a00319fd2b2ded98",
+      "version": "1.84.0",
+      "port-version": 1
+    },
     {
       "git-tree": "846d3e5195faf74db827dd0197a4fbc6a56315bb",
       "version": "1.84.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index fc9729d982..88ca49d588 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1002,7 +1002,7 @@
     },
     "boost-modular-build-helper": {
       "baseline": "1.84.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-move": {
       "baseline": "1.84.0",