microsoft · JavierMatosD · Apr 29, 2024 · Jun 28, 2023 · Jun 29, 2023 · Jun 30, 2023
diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake
@@ -8,5 +8,8 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
-boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+set(FEATURE_OPTIONS "")
+boost_configure_and_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+)
diff --git a/ports/boost-accumulators/vcpkg.json b/ports/boost-accumulators/vcpkg.json
@@ -19,6 +19,10 @@
       "name": "boost-circular-buffer",
       "version>=": "1.82.0"
     },
+    {
+      "name": "boost-cmake",
+      "version>=": "1.82.0"
+    },
     {
       "name": "boost-concept-check",
       "version>=": "1.82.0"
@@ -35,6 +39,10 @@
       "name": "boost-fusion",
       "version>=": "1.82.0"
     },
+    {
+      "name": "boost-headers",
+      "version>=": "1.82.0"
+    },
     {
       "name": "boost-iterator",
       "version>=": "1.82.0"
@@ -86,10 +94,6 @@
     {
       "name": "boost-ublas",
       "version>=": "1.82.0"
-    },
-    {
-      "name": "boost-vcpkg-helpers",
-      "version>=": "1.82.0"
     }
   ]
 }
diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake
@@ -8,5 +8,8 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
-boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+set(FEATURE_OPTIONS "")
+boost_configure_and_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+)
diff --git a/ports/boost-algorithm/vcpkg.json b/ports/boost-algorithm/vcpkg.json
@@ -19,6 +19,10 @@
       "name": "boost-bind",
       "version>=": "1.82.0"
     },
+    {
+      "name": "boost-cmake",
+      "version>=": "1.82.0"
+    },
     {
       "name": "boost-concept-check",
       "version>=": "1.82.0"
@@ -39,6 +43,10 @@
       "name": "boost-function",
       "version>=": "1.82.0"
     },
+    {
+      "name": "boost-headers",
+      "version>=": "1.82.0"
+    },
     {
       "name": "boost-iterator",
       "version>=": "1.82.0"
@@ -74,10 +82,6 @@
     {
       "name": "boost-unordered",
       "version>=": "1.82.0"
-    },
-    {
-      "name": "boost-vcpkg-helpers",
-      "version>=": "1.82.0"
     }
   ]
 }
diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake
@@ -8,5 +8,8 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
-boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+set(FEATURE_OPTIONS "")
+boost_configure_and_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+)
diff --git a/ports/boost-align/vcpkg.json b/ports/boost-align/vcpkg.json
@@ -11,6 +11,10 @@
       "name": "boost-assert",
       "version>=": "1.82.0"
     },
+    {
+      "name": "boost-cmake",
+      "version>=": "1.82.0"
+    },
     {
       "name": "boost-config",
       "version>=": "1.82.0"
@@ -20,11 +24,11 @@
       "version>=": "1.82.0"
     },
     {
-      "name": "boost-static-assert",
+      "name": "boost-headers",
       "version>=": "1.82.0"
     },
     {
-      "name": "boost-vcpkg-helpers",
+      "name": "boost-static-assert",
       "version>=": "1.82.0"
     }
   ]

diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake
@@ -8,5 +8,8 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
-boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+set(FEATURE_OPTIONS "")
+boost_configure_and_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+)
diff --git a/ports/boost-any/vcpkg.json b/ports/boost-any/vcpkg.json
@@ -11,6 +11,10 @@
       "name": "boost-assert",
       "version>=": "1.82.0"
     },
+    {
+      "name": "boost-cmake",
+      "version>=": "1.82.0"
+    },
     {
       "name": "boost-config",
       "version>=": "1.82.0"
@@ -19,6 +23,10 @@
       "name": "boost-core",
       "version>=": "1.82.0"
     },
+    {
+      "name": "boost-headers",
+      "version>=": "1.82.0"
+    },
     {
       "name": "boost-static-assert",
       "version>=": "1.82.0"
@@ -34,10 +42,6 @@
     {
       "name": "boost-type-traits",
       "version>=": "1.82.0"
-    },
-    {
-      "name": "boost-vcpkg-helpers",
-      "version>=": "1.82.0"
     }
   ]
 }
diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake
@@ -8,5 +8,8 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
-boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+set(FEATURE_OPTIONS "")
+boost_configure_and_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+)
diff --git a/ports/boost-array/vcpkg.json b/ports/boost-array/vcpkg.json
@@ -11,6 +11,10 @@
       "name": "boost-assert",
       "version>=": "1.82.0"
     },
+    {
+      "name": "boost-cmake",
+      "version>=": "1.82.0"
+    },
     {
       "name": "boost-config",
       "version>=": "1.82.0"
@@ -20,15 +24,15 @@
       "version>=": "1.82.0"
     },
     {
-      "name": "boost-static-assert",
+      "name": "boost-headers",
       "version>=": "1.82.0"
     },
     {
-      "name": "boost-throw-exception",
+      "name": "boost-static-assert",
       "version>=": "1.82.0"
     },
     {
-      "name": "boost-vcpkg-helpers",
+      "name": "boost-throw-exception",
       "version>=": "1.82.0"
     }
   ]

diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake
@@ -7,9 +7,12 @@ vcpkg_from_github(
     SHA512 d54fd77ca7996da138b10408df1eae28bbcae0c6475467cc19837bf6f6624c38ad7f9e1eec87ceae27f516583b204fdbaeb04daad7cc28e6aeec02ab5f188731
     HEAD_REF master
     PATCHES
+        fix_coro_compile_error_msvc.patch
         windows_alloca_header.patch
-        fix_coro_compile_error_msvc.patch #upstream PR: https://github.com/chriskohlhoff/asio/pull/1313
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
-boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+set(FEATURE_OPTIONS "")
+boost_configure_and_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+)
diff --git a/ports/boost-asio/vcpkg.json b/ports/boost-asio/vcpkg.json
@@ -2,7 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-asio",
   "version": "1.82.0",
-  "port-version": 3,
+  "port-version": 2,
   "description": "Boost asio module",
   "homepage": "https://github.com/boostorg/asio",
   "license": "BSL-1.0",
@@ -27,6 +27,10 @@
       "name": "boost-chrono",
       "version>=": "1.82.0"
     },
+    {
+      "name": "boost-cmake",
+      "version>=": "1.82.0"
+    },
     {
       "name": "boost-config",
       "version>=": "1.82.0"
@@ -57,6 +61,10 @@
       "name": "boost-function",
       "version>=": "1.82.0"
     },
+    {
+      "name": "boost-headers",
+      "version>=": "1.82.0"
+    },
     {
       "name": "boost-regex",
       "version>=": "1.82.0"
@@ -80,10 +88,6 @@
     {
       "name": "boost-utility",
       "version>=": "1.82.0"
-    },
-    {
-      "name": "boost-vcpkg-helpers",
-      "version>=": "1.82.0"
     }
   ],
   "features": {

diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake
@@ -8,5 +8,8 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
-boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+set(FEATURE_OPTIONS "")
+boost_configure_and_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+)
diff --git a/ports/boost-assert/vcpkg.json b/ports/boost-assert/vcpkg.json
@@ -7,12 +7,16 @@
   "homepage": "https://github.com/boostorg/assert",
   "license": "BSL-1.0",
   "dependencies": [
+    {
+      "name": "boost-cmake",
+      "version>=": "1.82.0"
+    },
     {
       "name": "boost-config",
       "version>=": "1.82.0"
     },
     {
-      "name": "boost-vcpkg-helpers",
+      "name": "boost-headers",
       "version>=": "1.82.0"
     }
   ]

diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake
@@ -8,5 +8,8 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
-boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+set(FEATURE_OPTIONS "")
+boost_configure_and_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+)
diff --git a/ports/boost-assign/vcpkg.json b/ports/boost-assign/vcpkg.json
@@ -11,6 +11,10 @@
       "name": "boost-array",
       "version>=": "1.82.0"
     },
+    {
+      "name": "boost-cmake",
+      "version>=": "1.82.0"
+    },
     {
       "name": "boost-config",
       "version>=": "1.82.0"
@@ -19,6 +23,10 @@
       "name": "boost-core",
       "version>=": "1.82.0"
     },
+    {
+      "name": "boost-headers",
+      "version>=": "1.82.0"
+    },
     {
       "name": "boost-move",
       "version>=": "1.82.0"
@@ -50,10 +58,6 @@
     {
       "name": "boost-type-traits",
       "version>=": "1.82.0"
-    },
-    {
-      "name": "boost-vcpkg-helpers",
-      "version>=": "1.82.0"
     }
   ]
 }
diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake
@@ -8,14 +8,8 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2"
-    "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]"
-    "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]"
+set(FEATURE_OPTIONS "")
+boost_configure_and_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
 )
-file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
-#Make sure to keep this line when updating boost.
-file(INSTALL "${SOURCE_PATH}/config/has_synchronization_lib.cpp" DESTINATION "${CURRENT_PACKAGES_DIR}/share/boost-atomic")
-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
@@ -16,17 +16,15 @@
       "version>=": "1.82.0"
     },
     {
-      "name": "boost-build",
-      "host": true,
+      "name": "boost-cmake",
       "version>=": "1.82.0"
     },
     {
       "name": "boost-config",
       "version>=": "1.82.0"
     },
     {
-      "name": "boost-modular-build-helper",
-      "host": true,
+      "name": "boost-headers",
       "version>=": "1.82.0"
     },
     {
@@ -45,17 +43,9 @@
       "name": "boost-type-traits",
       "version>=": "1.82.0"
     },
-    {
-      "name": "boost-vcpkg-helpers",
-      "version>=": "1.82.0"
-    },
     {
       "name": "boost-winapi",
       "version>=": "1.82.0"
-    },
-    {
-      "name": "vcpkg-cmake",
-      "host": true
     }
   ]
 }