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-thread | |
| 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-thread')
| -rw-r--r-- | ports/boost-thread/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/boost-thread/vcpkg.json | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake index 17c620ec4..f16abdf67 100644 --- a/ports/boost-thread/portfile.cmake +++ b/ports/boost-thread/portfile.cmake @@ -8,7 +8,10 @@ vcpkg_from_github( HEAD_REF master
)
-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)
+ message(FATAL_ERROR "boost-thread requires a newer version of vcpkg in order to build.")
+endif()
+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
boost_modular_build(
SOURCE_PATH ${SOURCE_PATH}
BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"
diff --git a/ports/boost-thread/vcpkg.json b/ports/boost-thread/vcpkg.json index 5cc1d3b32..be64e494b 100644 --- a/ports/boost-thread/vcpkg.json +++ b/ports/boost-thread/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-thread", "version-string": "1.75.0", + "port-version": 1, "description": "Boost thread module", "homepage": "https://github.com/boostorg/thread", "dependencies": [ @@ -8,7 +9,10 @@ "boost-assert", "boost-atomic", "boost-bind", - "boost-build", + { + "name": "boost-build", + "host": true + }, "boost-chrono", "boost-concept-check", "boost-config", @@ -24,7 +28,10 @@ "boost-io", "boost-lexical-cast", "boost-math", - "boost-modular-build-helper", + { + "name": "boost-modular-build-helper", + "host": true + }, "boost-move", "boost-optional", "boost-predef", |