Merge pull request #2589 from dbenson2000/boost-1.66-zlib

Restore support for zlib and gzip in iostreams
author: Robert Schumacher <roschuma@microsoft.com> 2018-01-17 23:30:10 -0800
committer: GitHub <noreply@github.com> 2018-01-17 23:30:10 -0800
commit: 00f3af78ee7636b1555cbd6a6873d9e5a3985f77 (patch)
tree: d3d7e224f03b18841ae9fc2ba78cc8a6d410f456
parent: 115bff5c07da30d3aef616ebea17a68fda0e5dbc (diff)
parent: 1e95a2cd8a47a40284fed7bb4547a8bf639a237f (diff)
download: vcpkg-00f3af78ee7636b1555cbd6a6873d9e5a3985f77.tar.gz
vcpkg-00f3af78ee7636b1555cbd6a6873d9e5a3985f77.zip
139 files changed, 226 insertions, 169 deletions
diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake
index b55026968..9c13dcc52 100644
--- a/ports/boost-accumulators/portfile.cmake
+++ b/ports/boost-accumulators/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake
index 2149ba0e0..2f6803405 100644
--- a/ports/boost-algorithm/portfile.cmake
+++ b/ports/boost-algorithm/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake
index 481b66321..80a2a7ab7 100644
--- a/ports/boost-align/portfile.cmake
+++ b/ports/boost-align/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake
index 76d723999..47de0a492 100644
--- a/ports/boost-any/portfile.cmake
+++ b/ports/boost-any/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake
index 8affa0dff..299bf6ff3 100644
--- a/ports/boost-array/portfile.cmake
+++ b/ports/boost-array/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake
index 4317b12d5..f513ae43c 100644
--- a/ports/boost-asio/portfile.cmake
+++ b/ports/boost-asio/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake
index 6112c47bf..cd0e8267f 100644
--- a/ports/boost-assert/portfile.cmake
+++ b/ports/boost-assert/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake
index 470e22cd9..e2d0a7e20 100644
--- a/ports/boost-assign/portfile.cmake
+++ b/ports/boost-assign/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake
index 650016d6f..feb671183 100644
--- a/ports/boost-atomic/portfile.cmake
+++ b/ports/boost-atomic/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-beast/portfile.cmake b/ports/boost-beast/portfile.cmake
index 06312f417..16d782d94 100644
--- a/ports/boost-beast/portfile.cmake
+++ b/ports/boost-beast/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-bimap/portfile.cmake b/ports/boost-bimap/portfile.cmake
index 313cd9075..eda19317a 100644
--- a/ports/boost-bimap/portfile.cmake
+++ b/ports/boost-bimap/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-bind/portfile.cmake b/ports/boost-bind/portfile.cmake
index 9cc1df5e7..8f6ee1cfb 100644
--- a/ports/boost-bind/portfile.cmake
+++ b/ports/boost-bind/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL
index d034154d3..12af51a0f 100644
--- a/ports/boost-build/CONTROL
+++ b/ports/boost-build/CONTROL
@@ -1,3 +1,3 @@
 Source: boost-build
-Version: 1.66.0
+Version: 1.66.0-2
 Description: Boost.Build
diff --git a/ports/boost-vcpkg-helpers/Jamroot.jam b/ports/boost-build/Jamroot.jam
index 2762c99ea..2762c99ea 100644
--- a/ports/boost-vcpkg-helpers/Jamroot.jam
+++ b/ports/boost-build/Jamroot.jam
diff --git a/ports/boost-vcpkg-helpers/boost-modular.cmake b/ports/boost-build/boost-modular-build.cmake
index 8e3ca378b..f0d43f1b3 100644
--- a/ports/boost-vcpkg-helpers/boost-modular.cmake
+++ b/ports/boost-build/boost-modular-build.cmake
@@ -1,4 +1,3 @@
-
 function(boost_modular_build)
     cmake_parse_arguments(_bm "" "SOURCE_PATH;REQUIREMENTS" "OPTIONS" ${ARGN})
 
@@ -21,7 +20,7 @@ function(boost_modular_build)
         list(APPEND _bm_OPTIONS windows-api=store)
     endif()
 
-    set(_bm_DIR ${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers)
+    set(_bm_DIR ${CURRENT_INSTALLED_DIR}/share/boost-build)
 
     if(EXISTS "${_bm_SOURCE_PATH}/Jamfile.v2")
         file(REMOVE_RECURSE "${_bm_SOURCE_PATH}/Jamfile.v2")
@@ -103,10 +102,25 @@ function(boost_modular_build)
         --ignore-site-config
         --hash
         -q
-
+        -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}\\include"
+        -sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}\\include"
         threadapi=win32
         threading=multi
     )
+    set(_bm_OPTIONS_DBG
+         -sZLIB_BINARY=zlibd
+         -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
+         -sBZIP2_BINARY=bz2d
+         -sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
+    )
+ 
+    set(_bm_OPTIONS_REL
+         -sZLIB_BINARY=zlib
+         -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
+         -sBZIP2_BINARY=bz2
+         -sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
+    )
+
 
     # Add build type specific options
     if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
@@ -177,6 +191,7 @@ function(boost_modular_build)
                 --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
                 --user-config=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam
                 ${_bm_OPTIONS}
+                ${_bm_OPTIONS_REL}
                 variant=release
                 debug-symbols=on
             WORKING_DIRECTORY ${_bm_SOURCE_PATH}
@@ -194,6 +209,7 @@ function(boost_modular_build)
                 --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
                 --user-config=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam
                 ${_bm_OPTIONS}
+                ${_bm_OPTIONS_DBG}
                 variant=debug
             WORKING_DIRECTORY ${_bm_SOURCE_PATH}
             LOGNAME build-${TARGET_TRIPLET}-dbg
@@ -245,37 +261,12 @@ function(boost_modular_build)
         string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
         string(REPLACE "-a64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
         string(REPLACE "_python3-" "_python-" NEW_FILENAME ${NEW_FILENAME})
-        if ("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}")
+        if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}")
             # nothing to do
-        elseif (EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
+        elseif(EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
             file(REMOVE ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME})
         else()
             file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
         endif()
     endforeach()
 endfunction()
-
-function(boost_modular_headers)
-    cmake_parse_arguments(_bm "" "SOURCE_PATH" "" ${ARGN})
-
-    if(NOT DEFINED _bm_SOURCE_PATH)
-        message(FATAL_ERROR "SOURCE_PATH is a required argument to boost_modular_headers.")
-    endif()
-
-    message(STATUS "Packaging headers")
-
-    file(
-        COPY ${_bm_SOURCE_PATH}/include/boost
-        DESTINATION ${CURRENT_PACKAGES_DIR}/include
-    )
-
-    message(STATUS "Packaging headers done")
-
-    vcpkg_download_distfile(ARCHIVE
-        URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.65.1/LICENSE_1_0.txt"
-        FILENAME "boost_LICENSE_1_0.txt"
-        SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8
-    )
-
-    file(INSTALL ${ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-endfunction()
diff --git a/ports/boost-vcpkg-helpers/nothing.bat b/ports/boost-build/nothing.bat
index e69de29bb..e69de29bb 100644
--- a/ports/boost-vcpkg-helpers/nothing.bat
+++ b/ports/boost-build/nothing.bat
diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake
index dec41e37b..9a02b061e 100644
--- a/ports/boost-build/portfile.cmake
+++ b/ports/boost-build/portfile.cmake
@@ -52,3 +52,14 @@ vcpkg_execute_required_process(
 
 file(INSTALL ${ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-build RENAME copyright)
 file(INSTALL ${BOOSTCPP_ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/boost-build RENAME boostcpp.jam)
+
+
+
+file(
+    COPY
+        ${CMAKE_CURRENT_LIST_DIR}/boost-modular-build.cmake
+        ${CMAKE_CURRENT_LIST_DIR}/Jamroot.jam
+        ${CMAKE_CURRENT_LIST_DIR}/nothing.bat
+        ${CMAKE_CURRENT_LIST_DIR}/user-config.jam
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-build
+)
diff --git a/ports/boost-vcpkg-helpers/user-config.jam b/ports/boost-build/user-config.jam
index c970f07a5..c970f07a5 100644
--- a/ports/boost-vcpkg-helpers/user-config.jam
+++ b/ports/boost-build/user-config.jam
diff --git a/ports/boost-callable-traits/portfile.cmake b/ports/boost-callable-traits/portfile.cmake
index 4bc138320..0a0a670b3 100644
--- a/ports/boost-callable-traits/portfile.cmake
+++ b/ports/boost-callable-traits/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake
index 167414ebf..d1cb98af1 100644
--- a/ports/boost-chrono/portfile.cmake
+++ b/ports/boost-chrono/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake
index ebb8be3d0..85b46c0d4 100644
--- a/ports/boost-circular-buffer/portfile.cmake
+++ b/ports/boost-circular-buffer/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-compatibility/portfile.cmake b/ports/boost-compatibility/portfile.cmake
index cd9464deb..e59db2e84 100644
--- a/ports/boost-compatibility/portfile.cmake
+++ b/ports/boost-compatibility/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake
index fd8e2cd39..2c70ac5ef 100644
--- a/ports/boost-compute/portfile.cmake
+++ b/ports/boost-compute/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake
index 0aa690830..36d7bac9c 100644
--- a/ports/boost-concept-check/portfile.cmake
+++ b/ports/boost-concept-check/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake
index 7b1a023c1..21d1c4083 100644
--- a/ports/boost-config/portfile.cmake
+++ b/ports/boost-config/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,6 +10,7 @@ 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})
 file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#ifndef BOOST_ALL_NO_LIB\n#define BOOST_ALL_NO_LIB\n#endif\n")
 file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#undef BOOST_ALL_DYN_LINK\n")
diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake
index 46aefd96d..d2cc5c209 100644
--- a/ports/boost-container/portfile.cmake
+++ b/ports/boost-container/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-context/portfile.cmake b/ports/boost-context/portfile.cmake
index 0e5852bb6..b749a9d80 100644
--- a/ports/boost-context/portfile.cmake
+++ b/ports/boost-context/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake
index 25b0a5dfb..00ce64df7 100644
--- a/ports/boost-conversion/portfile.cmake
+++ b/ports/boost-conversion/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-convert/portfile.cmake b/ports/boost-convert/portfile.cmake
index 10adca8e9..a3c10172a 100644
--- a/ports/boost-convert/portfile.cmake
+++ b/ports/boost-convert/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake
index 59cb63c78..70c989e16 100644
--- a/ports/boost-core/portfile.cmake
+++ b/ports/boost-core/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake
index 2ba322498..14c8dbe3b 100644
--- a/ports/boost-coroutine/portfile.cmake
+++ b/ports/boost-coroutine/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-coroutine2/portfile.cmake b/ports/boost-coroutine2/portfile.cmake
index 824403bbf..19ad0fecc 100644
--- a/ports/boost-coroutine2/portfile.cmake
+++ b/ports/boost-coroutine2/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake
index b8d183cd2..435ec9ad5 100644
--- a/ports/boost-crc/portfile.cmake
+++ b/ports/boost-crc/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake
index fad0f01e9..a171018c4 100644
--- a/ports/boost-date-time/portfile.cmake
+++ b/ports/boost-date-time/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-detail/portfile.cmake b/ports/boost-detail/portfile.cmake
index 072f14361..eec646472 100644
--- a/ports/boost-detail/portfile.cmake
+++ b/ports/boost-detail/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-disjoint-sets/portfile.cmake b/ports/boost-disjoint-sets/portfile.cmake
index 1b0c9aba3..223339e95 100644
--- a/ports/boost-disjoint-sets/portfile.cmake
+++ b/ports/boost-disjoint-sets/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake
index c387a6d7c..063b979f5 100644
--- a/ports/boost-dll/portfile.cmake
+++ b/ports/boost-dll/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-dynamic-bitset/portfile.cmake b/ports/boost-dynamic-bitset/portfile.cmake
index 63928751a..414f7b304 100644
--- a/ports/boost-dynamic-bitset/portfile.cmake
+++ b/ports/boost-dynamic-bitset/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake
index 14f19b0ed..911d90971 100644
--- a/ports/boost-endian/portfile.cmake
+++ b/ports/boost-endian/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake
index dd5d6540e..eda3644a7 100644
--- a/ports/boost-exception/portfile.cmake
+++ b/ports/boost-exception/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,7 +10,9 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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})
 
 set(VCPKG_LIBRARY_LINKAGE static)
diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake
index 0ea0edcc4..ef8751a53 100644
--- a/ports/boost-fiber/portfile.cmake
+++ b/ports/boost-fiber/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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/portfile.cmake b/ports/boost-filesystem/portfile.cmake
index e85cc096a..5a964b7a1 100644
--- a/ports/boost-filesystem/portfile.cmake
+++ b/ports/boost-filesystem/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-flyweight/portfile.cmake b/ports/boost-flyweight/portfile.cmake
index 858560aeb..25c0f65f5 100644
--- a/ports/boost-flyweight/portfile.cmake
+++ b/ports/boost-flyweight/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-foreach/portfile.cmake b/ports/boost-foreach/portfile.cmake
index 9801f7053..21c688318 100644
--- a/ports/boost-foreach/portfile.cmake
+++ b/ports/boost-foreach/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-format/portfile.cmake b/ports/boost-format/portfile.cmake
index a6c44bd27..a80e1c7e6 100644
--- a/ports/boost-format/portfile.cmake
+++ b/ports/boost-format/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-function-types/portfile.cmake b/ports/boost-function-types/portfile.cmake
index 1b3190699..2a679a25a 100644
--- a/ports/boost-function-types/portfile.cmake
+++ b/ports/boost-function-types/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake
index c0db0b55f..decf00686 100644
--- a/ports/boost-function/portfile.cmake
+++ b/ports/boost-function/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake
index 503d0786f..5de067de4 100644
--- a/ports/boost-functional/portfile.cmake
+++ b/ports/boost-functional/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-fusion/portfile.cmake b/ports/boost-fusion/portfile.cmake
index ab3b553dd..3923f82bc 100644
--- a/ports/boost-fusion/portfile.cmake
+++ b/ports/boost-fusion/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-geometry/portfile.cmake b/ports/boost-geometry/portfile.cmake
index 9e30e8fc7..c2f1d20ab 100644
--- a/ports/boost-geometry/portfile.cmake
+++ b/ports/boost-geometry/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake
index 8ce5cc5aa..deb977a20 100644
--- a/ports/boost-gil/portfile.cmake
+++ b/ports/boost-gil/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake
index 022831655..8d2fdb2eb 100644
--- a/ports/boost-graph-parallel/portfile.cmake
+++ b/ports/boost-graph-parallel/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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/portfile.cmake b/ports/boost-graph/portfile.cmake
index 84948ccad..21670d647 100644
--- a/ports/boost-graph/portfile.cmake
+++ b/ports/boost-graph/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-hana/portfile.cmake b/ports/boost-hana/portfile.cmake
index a46cfb28f..05ce047aa 100644
--- a/ports/boost-hana/portfile.cmake
+++ b/ports/boost-hana/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake
index 636763954..02a25bab9 100644
--- a/ports/boost-heap/portfile.cmake
+++ b/ports/boost-heap/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake
index e442621fa..1f6bac41b 100644
--- a/ports/boost-icl/portfile.cmake
+++ b/ports/boost-icl/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake
index 07dc91e20..4afba50e8 100644
--- a/ports/boost-integer/portfile.cmake
+++ b/ports/boost-integer/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake
index 6e959ca2d..c10635499 100644
--- a/ports/boost-interprocess/portfile.cmake
+++ b/ports/boost-interprocess/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-interval/portfile.cmake b/ports/boost-interval/portfile.cmake
index 0d0a88b8b..9fe190197 100644
--- a/ports/boost-interval/portfile.cmake
+++ b/ports/boost-interval/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-intrusive/portfile.cmake b/ports/boost-intrusive/portfile.cmake
index d562cd074..2fc9fd32a 100644
--- a/ports/boost-intrusive/portfile.cmake
+++ b/ports/boost-intrusive/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-io/portfile.cmake b/ports/boost-io/portfile.cmake
index fae7c9191..0991872ff 100644
--- a/ports/boost-io/portfile.cmake
+++ b/ports/boost-io/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake
index e49d4a579..782a7cb40 100644
--- a/ports/boost-iostreams/portfile.cmake
+++ b/ports/boost-iostreams/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-iterator/portfile.cmake b/ports/boost-iterator/portfile.cmake
index c20e9e29c..365938407 100644
--- a/ports/boost-iterator/portfile.cmake
+++ b/ports/boost-iterator/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-lambda/portfile.cmake b/ports/boost-lambda/portfile.cmake
index 315bf1ddf..bb9d68c6f 100644
--- a/ports/boost-lambda/portfile.cmake
+++ b/ports/boost-lambda/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake
index 5187ead72..b86e06415 100644
--- a/ports/boost-lexical-cast/portfile.cmake
+++ b/ports/boost-lexical-cast/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-local-function/portfile.cmake b/ports/boost-local-function/portfile.cmake
index 0c59a8db7..a4f378933 100644
--- a/ports/boost-local-function/portfile.cmake
+++ b/ports/boost-local-function/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake
index b8126dce5..9c1aa2ff4 100644
--- a/ports/boost-locale/portfile.cmake
+++ b/ports/boost-locale/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -17,6 +16,7 @@ else()
     set(BOOST_LOCALE_ICU off)
 endif()
 
+include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
@@ -25,4 +25,5 @@ boost_modular_build(
         /boost/locale//boost_locale
         boost.locale.icu=${BOOST_LOCALE_ICU}
 )
+include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake
index 0f6cabeb8..989729d14 100644
--- a/ports/boost-lockfree/portfile.cmake
+++ b/ports/boost-lockfree/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake
index ecc8118d9..302fb786a 100644
--- a/ports/boost-log/portfile.cmake
+++ b/ports/boost-log/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-logic/portfile.cmake b/ports/boost-logic/portfile.cmake
index 66df8aca6..08a578ccd 100644
--- a/ports/boost-logic/portfile.cmake
+++ b/ports/boost-logic/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake
index f6e4eeccd..2ad0b28e2 100644
--- a/ports/boost-math/portfile.cmake
+++ b/ports/boost-math/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-metaparse/portfile.cmake b/ports/boost-metaparse/portfile.cmake
index 972f5bf52..22742179c 100644
--- a/ports/boost-metaparse/portfile.cmake
+++ b/ports/boost-metaparse/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake
index 29f3a3ff7..c340db6e3 100644
--- a/ports/boost-move/portfile.cmake
+++ b/ports/boost-move/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake
index 3e39072a8..a350e333e 100644
--- a/ports/boost-mp11/portfile.cmake
+++ b/ports/boost-mp11/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-mpi/portfile.cmake b/ports/boost-mpi/portfile.cmake
index 66c11c29a..0ac40b4a6 100644
--- a/ports/boost-mpi/portfile.cmake
+++ b/ports/boost-mpi/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake
index 908524fb2..44fc12d93 100644
--- a/ports/boost-mpl/portfile.cmake
+++ b/ports/boost-mpl/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-msm/portfile.cmake b/ports/boost-msm/portfile.cmake
index fec66d317..c16c3a962 100644
--- a/ports/boost-msm/portfile.cmake
+++ b/ports/boost-msm/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-multi-array/portfile.cmake b/ports/boost-multi-array/portfile.cmake
index 312c4bfdd..ead468c54 100644
--- a/ports/boost-multi-array/portfile.cmake
+++ b/ports/boost-multi-array/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-multi-index/portfile.cmake b/ports/boost-multi-index/portfile.cmake
index a2b157fa6..7b8f35aff 100644
--- a/ports/boost-multi-index/portfile.cmake
+++ b/ports/boost-multi-index/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake
index 9fe2f040a..43423e6c3 100644
--- a/ports/boost-multiprecision/portfile.cmake
+++ b/ports/boost-multiprecision/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake
index e90d9dba2..c525b2e1f 100644
--- a/ports/boost-numeric-conversion/portfile.cmake
+++ b/ports/boost-numeric-conversion/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-odeint/portfile.cmake b/ports/boost-odeint/portfile.cmake
index 6ded9f5b2..5309f3663 100644
--- a/ports/boost-odeint/portfile.cmake
+++ b/ports/boost-odeint/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake
index e3144433b..af2b6641c 100644
--- a/ports/boost-optional/portfile.cmake
+++ b/ports/boost-optional/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake
index a5d119c15..871f7198b 100644
--- a/ports/boost-parameter/portfile.cmake
+++ b/ports/boost-parameter/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-phoenix/portfile.cmake b/ports/boost-phoenix/portfile.cmake
index 42281eba4..74e290f1e 100644
--- a/ports/boost-phoenix/portfile.cmake
+++ b/ports/boost-phoenix/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-poly-collection/portfile.cmake b/ports/boost-poly-collection/portfile.cmake
index b0fbf602a..7edccef50 100644
--- a/ports/boost-poly-collection/portfile.cmake
+++ b/ports/boost-poly-collection/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake
index f9390d963..1244b3abb 100644
--- a/ports/boost-polygon/portfile.cmake
+++ b/ports/boost-polygon/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake
index 1f5b5dfc9..2b70b4c24 100644
--- a/ports/boost-pool/portfile.cmake
+++ b/ports/boost-pool/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-predef/portfile.cmake b/ports/boost-predef/portfile.cmake
index ff0e9a9f1..289bc4988 100644
--- a/ports/boost-predef/portfile.cmake
+++ b/ports/boost-predef/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-preprocessor/portfile.cmake b/ports/boost-preprocessor/portfile.cmake
index 4b85735b4..0a2a62ad4 100644
--- a/ports/boost-preprocessor/portfile.cmake
+++ b/ports/boost-preprocessor/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake
index 444196c4e..3b5fac7cf 100644
--- a/ports/boost-process/portfile.cmake
+++ b/ports/boost-process/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake
index 61740c6cb..2eb6086f1 100644
--- a/ports/boost-program-options/portfile.cmake
+++ b/ports/boost-program-options/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-property-map/portfile.cmake b/ports/boost-property-map/portfile.cmake
index b5855bd8b..6f6739aa9 100644
--- a/ports/boost-property-map/portfile.cmake
+++ b/ports/boost-property-map/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-property-tree/portfile.cmake b/ports/boost-property-tree/portfile.cmake
index fd98c349b..8632df529 100644
--- a/ports/boost-property-tree/portfile.cmake
+++ b/ports/boost-property-tree/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-proto/portfile.cmake b/ports/boost-proto/portfile.cmake
index 50051cec1..c6ba949a2 100644
--- a/ports/boost-proto/portfile.cmake
+++ b/ports/boost-proto/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-ptr-container/portfile.cmake b/ports/boost-ptr-container/portfile.cmake
index 34a7e4cb4..8191f2c41 100644
--- a/ports/boost-ptr-container/portfile.cmake
+++ b/ports/boost-ptr-container/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake
index 395227990..db55b3e7b 100644
--- a/ports/boost-python/portfile.cmake
+++ b/ports/boost-python/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -16,5 +15,7 @@ file(GLOB PYTHON_INCLUDE_PATH "${CURRENT_INSTALLED_DIR}/include/python[0-9.]*")
 set(PYTHONLIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
 set(PYTHONLIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
 string(REGEX REPLACE ".*python([0-9\.]+)$" "\\1" PYTHON_VERSION "${PYTHON_INCLUDE_PATH}")
+include(${CURRENT_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-qvm/portfile.cmake b/ports/boost-qvm/portfile.cmake
index 1ef911b15..b16d419d5 100644
--- a/ports/boost-qvm/portfile.cmake
+++ b/ports/boost-qvm/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake
index f95153971..ec99fec55 100644
--- a/ports/boost-random/portfile.cmake
+++ b/ports/boost-random/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-range/portfile.cmake b/ports/boost-range/portfile.cmake
index 8769e1cdd..7b676d431 100644
--- a/ports/boost-range/portfile.cmake
+++ b/ports/boost-range/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-ratio/portfile.cmake b/ports/boost-ratio/portfile.cmake
index cb781cc5e..a39d80204 100644
--- a/ports/boost-ratio/portfile.cmake
+++ b/ports/boost-ratio/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-rational/portfile.cmake b/ports/boost-rational/portfile.cmake
index c0ad27744..437d650fa 100644
--- a/ports/boost-rational/portfile.cmake
+++ b/ports/boost-rational/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake
index 2246e3df4..58cd529cd 100644
--- a/ports/boost-regex/portfile.cmake
+++ b/ports/boost-regex/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -17,5 +16,7 @@ else()
     set(REQUIREMENTS)
 endif()
 
+include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(SOURCE_PATH ${SOURCE_PATH} REQUIREMENTS "${REQUIREMENTS}")
+include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake
index 60358a992..1c31b1002 100644
--- a/ports/boost-scope-exit/portfile.cmake
+++ b/ports/boost-scope-exit/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake
index 59276cfd3..2349283f2 100644
--- a/ports/boost-serialization/portfile.cmake
+++ b/ports/boost-serialization/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-signals/portfile.cmake b/ports/boost-signals/portfile.cmake
index 03895d120..a2453b0b5 100644
--- a/ports/boost-signals/portfile.cmake
+++ b/ports/boost-signals/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-signals2/portfile.cmake b/ports/boost-signals2/portfile.cmake
index 9e83e65c4..992a410c9 100644
--- a/ports/boost-signals2/portfile.cmake
+++ b/ports/boost-signals2/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-smart-ptr/portfile.cmake b/ports/boost-smart-ptr/portfile.cmake
index 5dbfc1473..de74fd25d 100644
--- a/ports/boost-smart-ptr/portfile.cmake
+++ b/ports/boost-smart-ptr/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-sort/portfile.cmake b/ports/boost-sort/portfile.cmake
index 9a13503f8..e5e63b33d 100644
--- a/ports/boost-sort/portfile.cmake
+++ b/ports/boost-sort/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake
index e9b239d69..0a5ebf5aa 100644
--- a/ports/boost-spirit/portfile.cmake
+++ b/ports/boost-spirit/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake
index 8f8c3afa1..34c6e6d31 100644
--- a/ports/boost-stacktrace/portfile.cmake
+++ b/ports/boost-stacktrace/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake
index 8b8e2da99..61680bd2b 100644
--- a/ports/boost-statechart/portfile.cmake
+++ b/ports/boost-statechart/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-static-assert/portfile.cmake b/ports/boost-static-assert/portfile.cmake
index 7768973dd..2598280af 100644
--- a/ports/boost-static-assert/portfile.cmake
+++ b/ports/boost-static-assert/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake
index c5ca8d0cc..bc35d0d93 100644
--- a/ports/boost-system/portfile.cmake
+++ b/ports/boost-system/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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/portfile.cmake b/ports/boost-test/portfile.cmake
index 090542bc7..57d6b99d0 100644
--- a/ports/boost-test/portfile.cmake
+++ b/ports/boost-test/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,7 +10,9 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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})
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake
index 307ae58b4..e1f0a0c2f 100644
--- a/ports/boost-thread/portfile.cmake
+++ b/ports/boost-thread/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(SOURCE_PATH ${SOURCE_PATH} REQUIREMENTS "<library>/boost/date_time//boost_date_time")
+include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-throw-exception/portfile.cmake b/ports/boost-throw-exception/portfile.cmake
index bdf47bac7..c4e87087e 100644
--- a/ports/boost-throw-exception/portfile.cmake
+++ b/ports/boost-throw-exception/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake
index 28210aabe..072b701a7 100644
--- a/ports/boost-timer/portfile.cmake
+++ b/ports/boost-timer/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake
index 74834110b..4f4c066bf 100644
--- a/ports/boost-tokenizer/portfile.cmake
+++ b/ports/boost-tokenizer/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-tti/portfile.cmake b/ports/boost-tti/portfile.cmake
index 2151427be..d263b7540 100644
--- a/ports/boost-tti/portfile.cmake
+++ b/ports/boost-tti/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-tuple/portfile.cmake b/ports/boost-tuple/portfile.cmake
index a020d5d1b..2c4cfe5be 100644
--- a/ports/boost-tuple/portfile.cmake
+++ b/ports/boost-tuple/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake
index 7363cfd8e..95c28afc6 100644
--- a/ports/boost-type-erasure/portfile.cmake
+++ b/ports/boost-type-erasure/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-index/portfile.cmake b/ports/boost-type-index/portfile.cmake
index 5f5f7dc7d..ae292b7e5 100644
--- a/ports/boost-type-index/portfile.cmake
+++ b/ports/boost-type-index/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake
index 3dbd82382..5a7fb6a79 100644
--- a/ports/boost-type-traits/portfile.cmake
+++ b/ports/boost-type-traits/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake
index 177e6d860..644b8e121 100644
--- a/ports/boost-typeof/portfile.cmake
+++ b/ports/boost-typeof/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake
index 173236e87..385810a3b 100644
--- a/ports/boost-ublas/portfile.cmake
+++ b/ports/boost-ublas/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-units/portfile.cmake b/ports/boost-units/portfile.cmake
index 87dd4906d..1180ec01b 100644
--- a/ports/boost-units/portfile.cmake
+++ b/ports/boost-units/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake
index abd0a3c3e..f90c8094f 100644
--- a/ports/boost-unordered/portfile.cmake
+++ b/ports/boost-unordered/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake
index 5cf3ceeed..42c9d1fc7 100644
--- a/ports/boost-utility/portfile.cmake
+++ b/ports/boost-utility/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-uuid/portfile.cmake b/ports/boost-uuid/portfile.cmake
index c6f2950a6..35b9c4c17 100644
--- a/ports/boost-uuid/portfile.cmake
+++ b/ports/boost-uuid/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-variant/portfile.cmake b/ports/boost-variant/portfile.cmake
index 9ec22e174..8e32a822d 100644
--- a/ports/boost-variant/portfile.cmake
+++ b/ports/boost-variant/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-vcpkg-helpers/CONTROL b/ports/boost-vcpkg-helpers/CONTROL
index 3e29eb9f8..42e02b3aa 100644
--- a/ports/boost-vcpkg-helpers/CONTROL
+++ b/ports/boost-vcpkg-helpers/CONTROL
@@ -1,3 +1,3 @@
 Source: boost-vcpkg-helpers
-Version: 3
+Version: 4
 Description: a set of vcpkg-internal scripts used to modularize boost
diff --git a/ports/boost-vcpkg-helpers/boost-modular-headers.cmake b/ports/boost-vcpkg-helpers/boost-modular-headers.cmake
new file mode 100644
index 000000000..1a4b8574b
--- /dev/null
+++ b/ports/boost-vcpkg-helpers/boost-modular-headers.cmake
@@ -0,0 +1,24 @@
+function(boost_modular_headers)
+    cmake_parse_arguments(_bm "" "SOURCE_PATH" "" ${ARGN})
+
+    if(NOT DEFINED _bm_SOURCE_PATH)
+        message(FATAL_ERROR "SOURCE_PATH is a required argument to boost_modular_headers.")
+    endif()
+
+    message(STATUS "Packaging headers")
+
+    file(
+        COPY ${_bm_SOURCE_PATH}/include/boost
+        DESTINATION ${CURRENT_PACKAGES_DIR}/include
+    )
+
+    message(STATUS "Packaging headers done")
+
+    vcpkg_download_distfile(ARCHIVE
+        URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.65.1/LICENSE_1_0.txt"
+        FILENAME "boost_LICENSE_1_0.txt"
+        SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8
+    )
+
+    file(INSTALL ${ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+endfunction()
diff --git a/ports/boost-vcpkg-helpers/generate-ports.ps1 b/ports/boost-vcpkg-helpers/generate-ports.ps1
index 09dcbca72..62cfe5cc2 100644
--- a/ports/boost-vcpkg-helpers/generate-ports.ps1
+++ b/ports/boost-vcpkg-helpers/generate-ports.ps1
@@ -22,7 +22,7 @@ function Generate()
     $sanitizedName = $name -replace "_","-"
 
     $versionsuffix = ""
-    if ($Name -eq "test")
+    if ($Name -eq "test" -or $Name -eq "python")
     {
         $versionsuffix = "-1"
     }
@@ -59,7 +59,6 @@ function Generate()
         "# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1"
         ""
         "include(vcpkg_common_functions)"
-        "include(`${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)"
         ""
         "vcpkg_from_github("
         "    OUT_SOURCE_PATH SOURCE_PATH"
@@ -93,6 +92,7 @@ function Generate()
                 "    set(BOOST_LOCALE_ICU off)"
                 "endif()"
                 ""
+                "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)"
                 "boost_modular_build("
                 "    SOURCE_PATH `${SOURCE_PATH}"
                 "    OPTIONS"
@@ -112,23 +112,29 @@ function Generate()
                 "    set(REQUIREMENTS)"
                 "endif()"
                 ""
+                "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)"
                 "boost_modular_build(SOURCE_PATH `${SOURCE_PATH} REQUIREMENTS `"`${REQUIREMENTS}`")"
             )
         }
         elseif ($Name -eq "thread")
         {
             $portfileLines += @(
+                "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)"
                 "boost_modular_build(SOURCE_PATH `${SOURCE_PATH} REQUIREMENTS `"<library>/boost/date_time//boost_date_time`")"
             )
         }
         else
         {
             $portfileLines += @(
+                "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)"
                 "boost_modular_build(SOURCE_PATH `${SOURCE_PATH})"
                 )
         }
     }
-    $portfileLines += @("boost_modular_headers(SOURCE_PATH `${SOURCE_PATH})")
+    $portfileLines += @(
+        "include(`${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)"
+        "boost_modular_headers(SOURCE_PATH `${SOURCE_PATH})"
+    )
 
     if ($Name -eq "exception")
     {
diff --git a/ports/boost-vcpkg-helpers/portfile.cmake b/ports/boost-vcpkg-helpers/portfile.cmake
index 3d31bd327..32f501f24 100644
--- a/ports/boost-vcpkg-helpers/portfile.cmake
+++ b/ports/boost-vcpkg-helpers/portfile.cmake
@@ -1,10 +1,6 @@
 
 file(
-    COPY
-        ${CMAKE_CURRENT_LIST_DIR}/boost-modular.cmake
-        ${CMAKE_CURRENT_LIST_DIR}/Jamroot.jam
-        ${CMAKE_CURRENT_LIST_DIR}/nothing.bat
-        ${CMAKE_CURRENT_LIST_DIR}/user-config.jam
+    COPY ${CMAKE_CURRENT_LIST_DIR}/boost-modular-headers.cmake
     DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-vcpkg-helpers
 )
 
diff --git a/ports/boost-vmd/portfile.cmake b/ports/boost-vmd/portfile.cmake
index 389ba79fd..eab18ada3 100644
--- a/ports/boost-vmd/portfile.cmake
+++ b/ports/boost-vmd/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake
index a9c3ea232..e335f6ba4 100644
--- a/ports/boost-wave/portfile.cmake
+++ b/ports/boost-wave/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,5 +10,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+include(${CURRENT_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-winapi/portfile.cmake b/ports/boost-winapi/portfile.cmake
index eb0b91b8f..d788dea86 100644
--- a/ports/boost-winapi/portfile.cmake
+++ b/ports/boost-winapi/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake
index 3848d814c..2eacea441 100644
--- a/ports/boost-xpressive/portfile.cmake
+++ b/ports/boost-xpressive/portfile.cmake
@@ -1,7 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 
 include(vcpkg_common_functions)
-include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular.cmake)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -11,4 +10,5 @@ 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})
author	Robert Schumacher <roschuma@microsoft.com>	2018-01-17 23:30:10 -0800
committer	GitHub <noreply@github.com>	2018-01-17 23:30:10 -0800
commit	00f3af78ee7636b1555cbd6a6873d9e5a3985f77 (patch)
tree	d3d7e224f03b18841ae9fc2ba78cc8a6d410f456
parent	115bff5c07da30d3aef616ebea17a68fda0e5dbc (diff)
parent	1e95a2cd8a47a40284fed7bb4547a8bf639a237f (diff)
download	vcpkg-00f3af78ee7636b1555cbd6a6873d9e5a3985f77.tar.gz vcpkg-00f3af78ee7636b1555cbd6a6873d9e5a3985f77.zip