diff options
| author | Andrew McMahon <andrew.p.mcmahon@gmail.com> | 2019-01-31 10:04:17 +1000 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-01-30 16:04:17 -0800 |
| commit | 0e759709ddc7dbad0b881f9f068f1b04b2092773 (patch) | |
| tree | 38ab53eee840d8c6b1ea6ed9ab88a7079a137b1f /ports/boost-modular-build-helper | |
| parent | 74e0c1a7849a898ddd5bd6863bf191dc2a60ddef (diff) | |
| download | vcpkg-0e759709ddc7dbad0b881f9f068f1b04b2092773.tar.gz vcpkg-0e759709ddc7dbad0b881f9f068f1b04b2092773.zip | |
[boost] update boost to 1.69. Fixes #5023 #4961 (#5059)
* Update boost to 1.69. Fixes #5023
- Remove boost-signal (rationale: deprecated and removed in 1.69)
- Remove boost-hana workaround by xiangfan-ms #4186 #3579 (rationale: 1.69 incorporates required fixes in hana master branch; builds fine in VS2017 15.9)
* [boost-signals] Restore signals from boost 1.68 because it is required by wt
* [boost-vcpkg-helpers] Improve dependency detection
* [boost-iostreams] Revert to cmake build to enable dependencies
* [boost-iostreams] Fix use of zstd in static builds
* [libtorrent] Update to 1.2.0
* [wt] Update to 4.0.5
* [boost-safe-numerics] [boost-vcpkg-helpers] Added safe_numerics; slight mod to regex match
* [hpx] Backport boost 1.69 fixes
* [libtorrent] Clean up cmake file installation
* [boost-type-traits] Fix MSVC arm
Diffstat (limited to 'ports/boost-modular-build-helper')
| -rw-r--r-- | ports/boost-modular-build-helper/Jamroot.jam | 4 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/boost-modular-build.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/boost-modular-build-helper/Jamroot.jam b/ports/boost-modular-build-helper/Jamroot.jam index 997c1234e..d85c8d662 100644 --- a/ports/boost-modular-build-helper/Jamroot.jam +++ b/ports/boost-modular-build-helper/Jamroot.jam @@ -1,5 +1,5 @@ -constant BOOST_VERSION : 1.68.0 ;
-constant BOOST_VERSION_ABI_TAG : 1_68 ;
+constant BOOST_VERSION : 1.69.0 ;
+constant BOOST_VERSION_ABI_TAG : 1_69 ;
constant BOOST_JAMROOT_MODULE : $(__name__) ;
import boostcpp ;
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 2ff2bb0d6..8daa3265e 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -349,7 +349,7 @@ function(boost_modular_build) string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
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 "-1_68" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries
+ string(REPLACE "-1_69" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 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}")
# nothing to do
|