diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2021-03-26 12:55:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-26 12:55:34 -0700 |
| commit | b5bb1511f0a07be530e0bde3ae098eb3d8e83e68 (patch) | |
| tree | 62f7ed43202e512d28ac92fb2be768283f62dee9 /ports/boost-context | |
| parent | 6a63ecae92e3eb26ae596e5c4ddf527f045803a4 (diff) | |
| download | vcpkg-b5bb1511f0a07be530e0bde3ae098eb3d8e83e68.tar.gz vcpkg-b5bb1511f0a07be530e0bde3ae098eb3d8e83e68.zip | |
[many ports] Apply host dependencies (#16479)
* [vcpkg] Add VCPKG_HOST_TRIPLET. Improve vcpkg.schema.json
* [many ports] Apply host dependencies
* [yasm-tool] Revert yasm-tool changes to split into PR #16478
* [many ports] Add versions
* [vcpkg.cmake] Revert change applied in other PR
* [boost-modular-build-helper] Merge from master
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/boost-context')
| -rw-r--r-- | ports/boost-context/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/boost-context/vcpkg.json | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake index 355839869..8563ece83 100644 --- a/ports/boost-context/portfile.cmake +++ b/ports/boost-context/portfile.cmake @@ -14,7 +14,10 @@ string(REPLACE "import ../../config/checks/config" "import config/checks/config" file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")
-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)
+ message(FATAL_ERROR "boost-context requires a newer version of vcpkg in order to build.")
+endif()
+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
configure_file(
"${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in"
"${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake"
diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json index 2829cc688..b0879e26a 100644 --- a/ports/boost-context/vcpkg.json +++ b/ports/boost-context/vcpkg.json @@ -1,18 +1,24 @@ { "name": "boost-context", "version-string": "1.75.0", - "port-version": 2, + "port-version": 3, "description": "Boost context module", "homepage": "https://github.com/boostorg/context", "supports": "!uwp & !emscripten", "dependencies": [ "boost-assert", - "boost-build", + { + "name": "boost-build", + "host": true + }, "boost-config", "boost-core", "boost-detail", "boost-integer", - "boost-modular-build-helper", + { + "name": "boost-modular-build-helper", + "host": true + }, "boost-pool", "boost-predef", "boost-smart-ptr", |