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-nowide | |
| 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-nowide')
| -rw-r--r-- | ports/boost-nowide/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/boost-nowide/vcpkg.json | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ports/boost-nowide/portfile.cmake b/ports/boost-nowide/portfile.cmake index 6efc96b71..b4fc82d51 100644 --- a/ports/boost-nowide/portfile.cmake +++ b/ports/boost-nowide/portfile.cmake @@ -15,7 +15,10 @@ string(REPLACE "check-target-builds ../config//lfs_support" "check-target-builds file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")
file(COPY "${SOURCE_PATH}/config/check_lfs_support.cpp" "${SOURCE_PATH}/config/check_movable_fstreams.cpp" 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-nowide 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-nowide/vcpkg.json b/ports/boost-nowide/vcpkg.json index 234dc681c..f23a27d27 100644 --- a/ports/boost-nowide/vcpkg.json +++ b/ports/boost-nowide/vcpkg.json @@ -1,16 +1,23 @@ { "name": "boost-nowide", "version-string": "1.75.0", + "port-version": 1, "description": "Boost nowide module", "homepage": "https://github.com/boostorg/nowide", "dependencies": [ - "boost-build", + { + "name": "boost-build", + "host": true + }, "boost-config", { "name": "boost-filesystem", "platform": "!uwp" }, - "boost-modular-build-helper", + { + "name": "boost-modular-build-helper", + "host": true + }, "boost-vcpkg-helpers" ] } |