[boost-cmake] Backport MSVC 19.40 is still vc143 (#40778)

ports/boost-cmake/portfile.cmake

@@ -10,6 +10,12 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+vcpkg_download_distfile(PATCH_MSVC_1940_STILL_VC143
+    URLS https://github.com/boostorg/cmake/commit/ae2e6a647187246d6009f80b56ba4c2c8f3a008c.patch?full_index=1
+    SHA512 bf36fc86981a2e0ed2a26aa56e88841b7600e39fbf32c76ef9abfc0f19edc67f23518ad84259f62f28d03b10819dd390806bd4866a38cb4a2d9e9eb7dd9f6cb4
+    FILENAME boostorg-cmake-boost-1.85.0-0009-msvc-1940-still-vc143.patch
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH_CMAKE
     REPO boostorg/cmake
@@ -23,6 +29,7 @@ vcpkg_from_github(
       "zstd.diff"
       "add-optional-deps.diff"
       "fix-missing-archs.diff"
+      "${PATCH_MSVC_1940_STILL_VC143}"
 )
 
 configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in" "${SOURCE_PATH_CMAKE}/CMakeLists.txt" @ONLY)

ports/boost-cmake/vcpkg.json

@@ -2,7 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-cmake",
   "version": "1.85.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Boost CMake support infrastructure",
   "homepage": "https://github.com/boostorg/cmake",
   "license": "BSL-1.0",

scripts/boost/generate-ports.ps1

@@ -28,8 +28,39 @@ $semverVersion = ($version -replace "(\d+(\.\d+){1,3}).*", "`$1")
 # Clear this array when moving to a new boost version
 $defaultPortVersion = 1
 $portVersions = @{
-    'boost-container' = 1;
+    'boost-asio'            = 2
-    'boost-math' = 2;
+    'boost-beast'           = 2
+    'boost-bimap'           = 2
+    'boost-build'           = 2
+    'boost-cmake'           = 2
+    'boost-cobalt'          = 2
+    'boost-compat'          = 2
+    'boost-core'            = 2
+    'boost-describe'        = 2
+    'boost-filesystem'      = 2
+    'boost-geometry'        = 2
+    'boost-intrusive'       = 2
+    'boost-json'            = 2
+    'boost-locale'          = 2
+    'boost-log'             = 2
+    'boost-math'            = 2
+    'boost-mpi'             = 2
+    'boost-msm'             = 2
+    'boost-multi-index'     = 2
+    'boost-multiprecision'  = 2
+    'boost-mysql'           = 2
+    'boost-nowide'          = 2
+    'boost-outcome'         = 2
+    'boost-pfr'             = 2
+    'boost-process'         = 2
+    'boost-program-options' = 2
+    'boost-python'          = 2
+    'boost-redis'           = 2
+    'boost-stacktrace'      = 3
+    'boost-timer'           = 2
+    'boost-unordered'       = 2
+    'boost-variant2'        = 2
+    'boost-wave'            = 2
 }
 
 function Get-PortVersion {
@@ -189,7 +220,7 @@ function GeneratePortDependency() {
         [string]$PortName = '',
         [string]$ForLibrary = ''
     )
-    if ($PortName -eq '') { 
+    if ($PortName -eq '') {
         $PortName = GeneratePortName $Library
     }
     $forPortName = GeneratePortName $ForLibrary
@@ -203,9 +234,9 @@ function GeneratePortDependency() {
         # For 'boost'.
         $platform = `
             $suppressPlatformForDependency[$PortName] `
-            | ForEach-Object { (GeneratePortDependency -PortName $_).platform } `
+        | ForEach-Object { (GeneratePortDependency -PortName $_).platform } `
-            | Group-Object -NoElement `
+        | Group-Object -NoElement `
-            | Join-String -Property Name -Separator ' & '
+        | Join-String -Property Name -Separator ' & '
         if ($platform -ne '') {
             @{name = $PortName; platform = $platform }
         }
@@ -291,7 +322,8 @@ function GeneratePortManifest() {
                 | Where-Object {
                     if ($_.Contains("name")) {
                         $_.name -notmatch "$dep_name"
-                    } else {
+                    }
+                    else {
                         $_ -notmatch "$dep_name"
                     }
                 }
@@ -600,10 +632,11 @@ foreach ($library in $libraries) {
 
         # Remove optional dependencies that are only used for tests or examples
         $deps = @($deps | Where-Object {
-            -not (
+                -not (
                 ($library -eq 'gil' -and $_ -eq 'filesystem') # PR #20575
-            )
+                )
-        })
+            }
+        )
 
         # Add dependency to the config for all libraries except the config library itself
         if ($library -ne 'config' -and $library -ne 'headers') {
@@ -614,13 +647,13 @@ foreach ($library in $libraries) {
             $deps = $deps | Select-Object -Unique
         }
 
-        $deps = @($deps | ForEach-Object { GeneratePortDependency $_ -ForLibrary $library})
+        $deps = @($deps | ForEach-Object { GeneratePortDependency $_ -ForLibrary $library })
 
         if ($library -ne 'cmake') {
-          $deps += @("boost-cmake")
+            $deps += @("boost-cmake")
-          if ($library -ne 'headers') {
+            if ($library -ne 'headers') {
-            $deps += @("boost-headers")
+                $deps += @("boost-headers")
-          }
+            }
         }
 
         GeneratePort `

versions/b-/boost-cmake.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2b1869c19b01257dc08348e1b29bcd7d5bad2fcc",
+      "version": "1.85.0",
+      "port-version": 2
+    },
     {
       "git-tree": "bcc90538b973f6b057014619e8a4e4da05d1f690",
       "version": "1.85.0",

versions/baseline.json

@@ -790,7 +790,7 @@
     },
     "boost-cmake": {
       "baseline": "1.85.0",
-      "port-version": 1
+      "port-version": 2
     },
     "boost-cobalt": {
       "baseline": "1.85.0",