From 5e96edc23c2204fb6f2beef1082446af56e13e5b Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Sat, 8 Jan 2022 05:39:58 +0800 Subject: [PATCH] [boost-modular-build-helper] Add missing dependency (#20842) --- ports/boost-modular-build-helper/boost-modular-build.cmake | 3 +++ ports/boost-modular-build-helper/vcpkg.json | 5 +++-- scripts/boost/generate-ports.ps1 | 2 +- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index d35b4f9911..2196068928 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -1,3 +1,6 @@ +include_guard(GLOBAL) +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake") + get_filename_component(BOOST_BUILD_INSTALLED_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) get_filename_component(BOOST_BUILD_INSTALLED_DIR "${BOOST_BUILD_INSTALLED_DIR}" DIRECTORY) diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index a4292b000a..6ffc2a2e4b 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,9 +1,10 @@ { "name": "boost-modular-build-helper", "version": "1.77.0", - "port-version": 5, + "port-version": 6, "description": "Internal vcpkg port used to build Boost libraries", "dependencies": [ - "boost-uninstall" + "boost-uninstall", + "vcpkg-cmake" ] } diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 3e9ec8f6b9..caa8aea307 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -569,7 +569,7 @@ if ($updateServicePorts) { GeneratePortManifest ` -PortName "boost-modular-build-helper" ` -Description "Internal vcpkg port used to build Boost libraries" ` - -Dependencies @("boost-uninstall") + -Dependencies @("boost-uninstall", "vcpkg-cmake") # Update Boost version in boost-modular-build.cmake $boost_modular_build = "$portsDir/boost-modular-build-helper/boost-modular-build.cmake" diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index b48154aac2..47816d3060 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3edff222b218a808eca74d6891afc1693ec4774", + "version": "1.77.0", + "port-version": 6 + }, { "git-tree": "48cc9da813626ac4733698e65368e5581f4efb59", "version": "1.77.0", diff --git a/versions/baseline.json b/versions/baseline.json index b81d25b9bf..350ccdc332 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -826,7 +826,7 @@ }, "boost-modular-build-helper": { "baseline": "1.77.0", - "port-version": 5 + "port-version": 6 }, "boost-move": { "baseline": "1.77.0",